Skip to content
Snippets Groups Projects
Unverified Commit 7a68203c authored by reivilibre's avatar reivilibre Committed by GitHub
Browse files

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

parent 67aae05e
No related branches found
No related tags found
No related merge requests found
Disable 'faster room join' Complement tests when testing against Synapse with workers.
\ No newline at end of file
...@@ -45,6 +45,8 @@ docker build -t matrixdotorg/synapse -f "docker/Dockerfile" . ...@@ -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 ...@@ -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 ...@@ -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/...
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment