kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge branch 'develop' into madlittlemods/deflake-msc3030-backfill-test-with-workers

Browse Source 
Conflicts:
	scripts-dev/complement.sh
This commit is contained in:
Eric Eastwood
2022-10-13 04:18:44 -05:00
parent 7139ba541c b6baa46db0
commit abe446f970
117 changed files with 1201 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts-dev/complement.sh
View File

@@ -159,8 +159,13 @@ else
# We only test faster room joins on monoliths, because they are purposefully
# being developed without worker support to start with.
#
<<<<<<< HEAD
# Importing historical history and jump to date also only support monoliths,
# currently.
=======
# The tests for importing historical messages (MSC2716) and jump to date (MSC3030)
# also only pass with monoliths, currently.
>>>>>>> develop
test_tags="$test_tags,faster_joins,msc2716,msc3030"
fi