diff options
| author | reivilibre <oliverw@matrix.org> | 2022-05-23 17:27:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 17:27:05 +0100 |
| commit | 7a68203cde312c57137735a19c274a6d8470a2bf (patch) | |
| tree | ce72dfca4542b5f449728ff18c41033c311d968e | |
| parent | Support registering Application Services when running with workers under Comp... (diff) | |
| download | synapse-7a68203cde312c57137735a19c274a6d8470a2bf.tar.xz | |
Disable 'faster room join' Complement tests when testing against Synapse with workers. (#12842)
| -rw-r--r-- | changelog.d/12842.misc | 1 | ||||
| -rwxr-xr-x | scripts-dev/complement.sh | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changelog.d/12842.misc b/changelog.d/12842.misc new file mode 100644 index 0000000000..cec3f97d86 --- /dev/null +++ b/changelog.d/12842.misc @@ -0,0 +1 @@ +Disable 'faster room join' Complement tests when testing against Synapse with workers. \ No newline at end of file diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh index 190df6909a..ca476d9a5e 100755 --- a/scripts-dev/complement.sh +++ b/scripts-dev/complement.sh @@ -45,6 +45,8 @@ docker build -t matrixdotorg/synapse -f "docker/Dockerfile" . extra_test_args=() +test_tags="synapse_blacklist,msc2716,msc3030" + # If we're using workers, modify the docker files slightly. if [[ -n "$WORKERS" ]]; then # Build the workers docker image (from the base Synapse image). @@ -65,6 +67,10 @@ if [[ -n "$WORKERS" ]]; then else export COMPLEMENT_BASE_IMAGE=complement-synapse 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 # 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! echo "Images built; running complement" 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/... |