aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-10-25 13:37:38 -0400
committerAlexander Færøy <ahf@torproject.org>2021-10-25 20:56:26 +0000
commit12c37873050624ce2baff2db0cbbf26ef18e6111 (patch)
treec215ad50870bfe08552d50e603070474459af52e /scripts
parent1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8 (diff)
downloadtor-12c37873050624ce2baff2db0cbbf26ef18e6111.tar.gz
tor-12c37873050624ce2baff2db0cbbf26ef18e6111.zip
ci: Exclude HSv2 Stem tests
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/ci-driver.sh8
1 files changed, 8 insertions, 0 deletions
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 \