diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-10-25 21:02:55 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-10-25 21:02:55 +0000 |
| commit | 0c5128eeb24c5f9e6b62117eb668f0c7679d0fc3 (patch) | |
| tree | a02bf933d59e5901206081095137a8caf2538add | |
| parent | d496a750266c777466f14639a76e43657dd68226 (diff) | |
| parent | 12c37873050624ce2baff2db0cbbf26ef18e6111 (diff) | |
| download | tor-0c5128eeb24c5f9e6b62117eb668f0c7679d0fc3.tar.gz tor-0c5128eeb24c5f9e6b62117eb668f0c7679d0fc3.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -rw-r--r-- | changes/ticket40500 | 3 | ||||
| -rwxr-xr-x | scripts/ci/ci-driver.sh | 7 |
2 files changed, 6 insertions, 4 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 3e47f68187..f37c009666 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -470,10 +470,9 @@ 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 + # 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. |