diff options
| author | Erik Johnston <erik@matrix.org> | 2022-06-14 17:59:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 17:59:06 +0100 |
| commit | aef398457fff33d6ac079e2665ed725397ade7f5 (patch) | |
| tree | 89704fbc5d8e38c96ec7d4d15d6d410121912547 /scripts-dev/complement.sh | |
| parent | Fix version number in spam checker callbacks doc (#13047) (diff) | |
| download | synapse-aef398457fff33d6ac079e2665ed725397ade7f5.tar.xz | |
Up complement time outs (#13048)
Diffstat (limited to 'scripts-dev/complement.sh')
| -rwxr-xr-x | scripts-dev/complement.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh index 30b974b954..52ef1fd07f 100755 --- a/scripts-dev/complement.sh +++ b/scripts-dev/complement.sh @@ -60,6 +60,9 @@ test_tags="synapse_blacklist,msc2716,msc3030,msc3787" # (The prefix is stripped off before reaching the container.) export COMPLEMENT_SHARE_ENV_PREFIX=PASS_ +# It takes longer than 10m to run the whole suite. +extra_test_args+=("-timeout=60m") + if [[ -n "$WORKERS" ]]; then # Use workers. export PASS_SYNAPSE_COMPLEMENT_USE_WORKERS=true @@ -73,9 +76,6 @@ if [[ -n "$WORKERS" ]]; then # time (the main problem is that we start 14 python processes for each test, # and complement likes to do two of them in parallel). export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=120 - - # ... and it takes longer than 10m to run the whole suite. - extra_test_args+=("-timeout=60m") else export PASS_SYNAPSE_COMPLEMENT_USE_WORKERS= if [[ -n "$POSTGRES" ]]; then |