Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable 'faster room join' Complement tests when testing against Synapse with workers. (#12842)

This commit is contained in:
reivilibre 2022-05-23 17:27:05 +01:00 committed by GitHub
parent 67aae05ece
commit 7a68203cde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12842.misc Normal file
View File

@ -0,0 +1 @@
Disable 'faster room join' Complement tests when testing against Synapse with workers.

9
scripts-dev/complement.sh
View File

@ -45,6 +45,8 @@ docker build -t matrixdotorg/synapse -f "docker/Dockerfile" .
extra_test_args=() extra_test_args=()
test_tags="synapse_blacklist,msc2716,msc3030"
# If we're using workers, modify the docker files slightly. # If we're using workers, modify the docker files slightly.
if [[ -n "$WORKERS" ]]; then if [[ -n "$WORKERS" ]]; then
# Build the workers docker image (from the base Synapse image). # Build the workers docker image (from the base Synapse image).
@ -65,6 +67,10 @@ if [[ -n "$WORKERS" ]]; then
else else
export COMPLEMENT_BASE_IMAGE=complement-synapse export COMPLEMENT_BASE_IMAGE=complement-synapse
COMPLEMENT_DOCKERFILE=Dockerfile COMPLEMENT_DOCKERFILE=Dockerfile
# We only test faster room joins on monoliths, because they are purposefully
# being developed without worker support to start with.
test_tags="$test_tags,faster_joins"
fi fi
# Build the Complement image from the Synapse image we just built. # 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
# Run the tests! # Run the tests!
echo "Images built; running complement" echo "Images built; running complement"
cd "$COMPLEMENT_DIR" cd "$COMPLEMENT_DIR"
go test -v -tags synapse_blacklist,msc2716,msc3030,faster_joins -count=1 "${extra_test_args[@]}" "$@" ./tests/...
go test -v -tags $test_tags -count=1 "${extra_test_args[@]}" "$@" ./tests/...