summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.ci/worker-blacklist8
-rw-r--r--changelog.d/10788.misc1
-rw-r--r--sytest-blacklist11
3 files changed, 2 insertions, 18 deletions
diff --git a/.ci/worker-blacklist b/.ci/worker-blacklist
index 5975cb98cf..cb8eae5d2a 100644
--- a/.ci/worker-blacklist
+++ b/.ci/worker-blacklist
@@ -1,10 +1,2 @@
 # This file serves as a blacklist for SyTest tests that we expect will fail in
 # Synapse when run under worker mode. For more details, see sytest-blacklist.
-
-Can re-join room if re-invited
-
-# new failures as of https://github.com/matrix-org/sytest/pull/732
-Device list doesn't change if remote server is down
-
-# https://buildkite.com/matrix-dot-org/synapse/builds/6134#6f67bf47-e234-474d-80e8-c6e1868b15c5
-Server correctly handles incoming m.device_list_update
diff --git a/changelog.d/10788.misc b/changelog.d/10788.misc
new file mode 100644
index 0000000000..568a85ac52
--- /dev/null
+++ b/changelog.d/10788.misc
@@ -0,0 +1 @@
+Remove fixed and flakey tests from the sytest-blacklist.
diff --git a/sytest-blacklist b/sytest-blacklist
index de9986357b..65bf1774e3 100644
--- a/sytest-blacklist
+++ b/sytest-blacklist
@@ -1,5 +1,5 @@
 # This file serves as a blacklist for SyTest tests that we expect will fail in
-# Synapse.
+# Synapse. This doesn't include flakey tests---better to deflake them instead.
 #
 # Each line of this file is scanned by sytest during a run and if the line
 # exactly matches the name of a test, it will be marked as "expected fail",
@@ -9,9 +9,6 @@
 # Test names are encouraged to have a bug accompanied with them, serving as an
 # explanation for why the test has been excluded.
 
-# Blacklisted due to https://github.com/matrix-org/synapse/issues/1679
-Remote room members also see posted message events
-
 # Blacklisted due to https://github.com/matrix-org/synapse/issues/2065
 Guest users can accept invites to private rooms over federation
 
@@ -24,12 +21,6 @@ Newly created users see their own presence in /initialSync (SYT-34)
 # Blacklisted due to https://github.com/matrix-org/synapse/issues/1396
 Should reject keys claiming to belong to a different user
 
-# Blacklisted due to https://github.com/matrix-org/synapse/issues/1531
-Enabling an unknown default rule fails with 404
-
-# Blacklisted due to https://github.com/matrix-org/synapse/issues/1663
-New federated private chats get full presence information (SYN-115)
-
 # Blacklisted due to https://github.com/matrix-org/matrix-doc/pull/2314 removing
 # this requirement from the spec
 Inbound federation of state requires event_id as a mandatory paramater