Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 7a68203

Browse files
authored
Disable 'faster room join' Complement tests when testing against Synapse with workers. (#12842)
1 parent 67aae05 commit 7a68203

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

changelog.d/12842.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Disable 'faster room join' Complement tests when testing against Synapse with workers.

scripts-dev/complement.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ docker build -t matrixdotorg/synapse -f "docker/Dockerfile" .
4545

4646
extra_test_args=()
4747

48+
test_tags="synapse_blacklist,msc2716,msc3030"
49+
4850
# If we're using workers, modify the docker files slightly.
4951
if [[ -n "$WORKERS" ]]; then
5052
# Build the workers docker image (from the base Synapse image).
@@ -65,6 +67,10 @@ if [[ -n "$WORKERS" ]]; then
6567
else
6668
export COMPLEMENT_BASE_IMAGE=complement-synapse
6769
COMPLEMENT_DOCKERFILE=Dockerfile
70+
71+
# We only test faster room joins on monoliths, because they are purposefully
72+
# being developed without worker support to start with.
73+
test_tags="$test_tags,faster_joins"
6874
fi
6975

7076
# Build the Complement image from the Synapse image we just built.
@@ -73,4 +79,5 @@ docker build -t $COMPLEMENT_BASE_IMAGE -f "docker/complement/$COMPLEMENT_DOCKERF
7379
# Run the tests!
7480
echo "Images built; running complement"
7581
cd "$COMPLEMENT_DIR"
76-
go test -v -tags synapse_blacklist,msc2716,msc3030,faster_joins -count=1 "${extra_test_args[@]}" "$@" ./tests/...
82+
83+
go test -v -tags $test_tags -count=1 "${extra_test_args[@]}" "$@" ./tests/...

0 commit comments

Comments
 (0)