diff options
| author | Filip Lajszczak <filip.lajszczak@gmail.com> | 2020-02-06 18:14:17 +0300 |
|---|---|---|
| committer | Filip Lajszczak <filip.lajszczak@gmail.com> | 2020-02-06 18:14:17 +0300 |
| commit | 2b051dd197804b5c93b6e38aae91c991278afdba (patch) | |
| tree | e2872c7a8e89f03e0e4675e2d217c595d50a768c /tests/letstest/scripts/test_apache2.sh | |
| parent | b27e5804b9671e28f37a6da7e2f1f7fa9455d24a (diff) | |
| parent | 7da5196206b33d5593bd15cd1dcce4d790db7e6d (diff) | |
Merge branch 'master' of https://github.com/certbot/certbot
Diffstat (limited to 'tests/letstest/scripts/test_apache2.sh')
| -rwxr-xr-x | tests/letstest/scripts/test_apache2.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/letstest/scripts/test_apache2.sh b/tests/letstest/scripts/test_apache2.sh index d24de2458..9af39e8bb 100755 --- a/tests/letstest/scripts/test_apache2.sh +++ b/tests/letstest/scripts/test_apache2.sh @@ -45,8 +45,13 @@ if [ $? -ne 0 ] ; then exit 1 fi -python tools/_venv_common.py -e acme[dev] -e .[dev,docs] -e certbot-apache -sudo venv/bin/certbot -v --debug --text --agree-dev-preview --agree-tos \ +# This script sets the environment variables PYTHON_NAME, VENV_PATH, and +# VENV_SCRIPT based on the version of Python available on the system. For +# instance, Fedora uses Python 3 and Python 2 is not installed. +. tests/letstest/scripts/set_python_envvars.sh + +"$VENV_SCRIPT" -e acme[dev] -e certbot[dev,docs] -e certbot-apache +sudo "$VENV_PATH/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 @@ -55,7 +60,7 @@ fi if [ "$OS_TYPE" = "ubuntu" ] ; then export SERVER="$BOULDER_URL" - venv/bin/tox -e apacheconftest + "$VENV_PATH/bin/tox" -e apacheconftest else echo Not running hackish apache tests on $OS_TYPE fi |