diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-10-25 21:01:58 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-10-25 21:01:58 +0000 |
| commit | 290196a1391c194fc11fbf5145d2a058501c955f (patch) | |
| tree | 5c073f21f77f29d165f4bacee2d7e8a93f054474 | |
| parent | 10d469a731d4714662b0a06b9e9844af7342f694 (diff) | |
| parent | 12c37873050624ce2baff2db0cbbf26ef18e6111 (diff) | |
| download | tor-290196a1391c194fc11fbf5145d2a058501c955f.tar.gz tor-290196a1391c194fc11fbf5145d2a058501c955f.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
| -rw-r--r-- | changes/ticket40500 | 3 | ||||
| -rwxr-xr-x | scripts/ci/ci-driver.sh | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/ticket40500 b/changes/ticket40500 new file mode 100644 index 0000000000..2e5ff39761 --- /dev/null +++ b/changes/ticket40500 @@ -0,0 +1,3 @@ + o Minor bugfix (CI, onion service): + - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500; + bugfix on 0.3.2.1-alpha. diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index c07d99188b..e83b3d6f46 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -460,12 +460,20 @@ fi if [[ "${STEM}" = "yes" ]]; then start_section "Stem" + # 0.3.5 and onward have now disabled onion service v2 so we need to exclude + # these Stem tests from now on. + 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" 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 \ |