commit 6e6ad44262f63938164b85377408416bab5a3da0 Author: David Goulet <dgoulet@torproject.org> Date: Tue Feb 16 12:53:57 2021 -0500 test: Exclude HSv2 test from Stem CI driver Signed-off-by: David Goulet <dgoulet@torproject.org> --- scripts/ci/ci-driver.sh | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index c07d99188b..3e47f68187 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -293,6 +293,7 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') # Tor version. Only create the variables we need. TOR_VER_AT_LEAST_043=no TOR_VER_AT_LEAST_044=no +TOR_VER_AT_LEAST_046=no # These are the currently supported Tor versions; no need to work with anything # ancient in this script. @@ -309,10 +310,19 @@ case "$TOR_VERSION" in TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=no ;; - *) + 0.4.4.*) TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=yes ;; + 0.4.5.*) + TOR_VER_AT_LEAST_043=yes + TOR_VER_AT_LEAST_044=yes + ;; + 0.4.6.*) + TOR_VER_AT_LEAST_043=yes + TOR_VER_AT_LEAST_044=yes + TOR_VER_AT_LEAST_046=yes + ;; esac ############################################################################# @@ -460,12 +470,21 @@ fi if [[ "${STEM}" = "yes" ]]; then start_section "Stem" + EXCLUDE_TESTS="" + if [[ "${TOR_VER_AT_LEAST_046}" = 'yes' ]]; then + EXCLUDE_TESTS="--exclude-test control.controller.test_ephemeral_hidden_services_v2 --exclude-test control.controller.test_hidden_services_conf --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth --exclude-test control.controller.test_without_ephemeral_hidden_services --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth_no_credentials" + fi if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then # XXXX This should probably be part of some test-stem make target. + + # Disable the check around EXCLUDE_TESTS that requires double quote. We + # need it to be expanded. + # shellcheck disable=SC2086 if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \ python3 "${STEM_PATH}/run_tests.py" \ --tor src/app/tor \ --integ --test control.controller \ + $EXCLUDE_TESTS \ --test control.base_controller \ --test process \ --log TRACE \