diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh index 5657b4ed5..188d430d6 100755 --- a/tests/letstest/scripts/test_apache2.sh +++ b/tests/letstest/scripts/test_apache2.sh @@ -70,43 +70,43 @@ if command -v python && [ $(python -V 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | se PATH="/opt/rh/rh-python36/root/usr/bin:$PATH" fi -# tools/venv3.py -e acme[dev] -e certbot[dev,docs] -e certbot-apache +tools/venv3.py -e acme[dev] -e certbot[dev,docs] -e certbot-apache -# sudo "venv3/bin/certbot" -v --debug --text --agree-tos \ -# --renew-by-default --redirect --register-unsafely-without-email \ -# --domain $PUBLIC_HOSTNAME --server $BOULDER_URL -# if [ $? -ne 0 ] ; then -# FAIL=1 -# fi +sudo "venv3/bin/certbot" -v --debug --text --agree-tos \ + --renew-by-default --redirect --register-unsafely-without-email \ + --domain $PUBLIC_HOSTNAME --server $BOULDER_URL +if [ $? -ne 0 ] ; then + FAIL=1 +fi -# # Check that ssl_module detection is working on various systems -# if [ "$OS_TYPE" = "ubuntu" ] ; then -# MOD_SSL_LOCATION="/usr/lib/apache2/modules/mod_ssl.so" -# APACHE_NAME=apache2ctl -# elif [ "$OS_TYPE" = "centos" ]; then -# MOD_SSL_LOCATION="/etc/httpd/modules/mod_ssl.so" -# APACHE_NAME=httpd -# fi -# OPENSSL_VERSION=$(strings "$MOD_SSL_LOCATION" | egrep -o -m1 '^OpenSSL ([0-9]\.[^ ]+) ' | tail -c +9) -# APACHE_VERSION=$(sudo $APACHE_NAME -v | egrep -o 'Apache/([0-9]\.[^ ]+)' | tail -c +8) -# "venv3/bin/python" tests/letstest/scripts/test_openssl_version.py "$OPENSSL_VERSION" "$APACHE_VERSION" -# if [ $? -ne 0 ] ; then -# FAIL=1 -# fi +# Check that ssl_module detection is working on various systems +if [ "$OS_TYPE" = "ubuntu" ] ; then + MOD_SSL_LOCATION="/usr/lib/apache2/modules/mod_ssl.so" + APACHE_NAME=apache2ctl +elif [ "$OS_TYPE" = "centos" ]; then + MOD_SSL_LOCATION="/etc/httpd/modules/mod_ssl.so" + APACHE_NAME=httpd +fi +OPENSSL_VERSION=$(strings "$MOD_SSL_LOCATION" | egrep -o -m1 '^OpenSSL ([0-9]\.[^ ]+) ' | tail -c +9) +APACHE_VERSION=$(sudo $APACHE_NAME -v | egrep -o 'Apache/([0-9]\.[^ ]+)' | tail -c +8) +"venv3/bin/python" tests/letstest/scripts/test_openssl_version.py "$OPENSSL_VERSION" "$APACHE_VERSION" +if [ $? -ne 0 ] ; then + FAIL=1 +fi -# if [ "$OS_TYPE" = "ubuntu" ] ; then -# export SERVER="$BOULDER_URL" -# "venv3/bin/tox" -e apacheconftest -# else -# echo Not running hackish apache tests on $OS_TYPE -# fi +if [ "$OS_TYPE" = "ubuntu" ] ; then + export SERVER="$BOULDER_URL" + "venv3/bin/tox" -e apacheconftest +else + echo Not running hackish apache tests on $OS_TYPE +fi -# if [ $? -ne 0 ] ; then -# FAIL=1 -# fi +if [ $? -ne 0 ] ; then + FAIL=1 +fi -# # return error if any of the subtests failed -# if [ "$FAIL" = 1 ] ; then -# exit 1 -# fi +# return error if any of the subtests failed +if [ "$FAIL" = 1 ] ; then + exit 1 +fi