Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
7a68203c
Unverified
Commit
7a68203c
authored
2 years ago
by
reivilibre
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/12842.misc
+1
-0
1 addition, 0 deletions
changelog.d/12842.misc
scripts-dev/complement.sh
+8
-1
8 additions, 1 deletion
scripts-dev/complement.sh
with
9 additions
and
1 deletion
changelog.d/12842.misc
0 → 100644
+
1
−
0
View file @
7a68203c
Disable 'faster room join' Complement tests when testing against Synapse with workers.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
scripts-dev/complement.sh
+
8
−
1
View file @
7a68203c
...
@@ -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/...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment