summary refs log tree commit diff
path: root/sytest-blacklist
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-25 17:53:13 +0100
committerErik Johnston <erik@matrix.org>2019-09-25 17:53:13 +0100
commit4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88 (patch)
tree7780de5531566372372992521f2476551a51be73 /sytest-blacklist
parentReview comments (diff)
parentMerge pull request #6089 from matrix-org/erikj/cleanup_user_ips (diff)
downloadsynapse-4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2
Diffstat (limited to 'sytest-blacklist')
-rw-r--r--sytest-blacklist9
1 files changed, 0 insertions, 9 deletions
diff --git a/sytest-blacklist b/sytest-blacklist
index 04698cb068..11785fd43f 100644
--- a/sytest-blacklist
+++ b/sytest-blacklist
@@ -29,12 +29,3 @@ 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 temporarily due to https://github.com/matrix-org/matrix-doc/pull/2290
-# These sytests need to be updated with new endpoints, which will come in a later PR
-# That PR will also remove this blacklist
-Can bind 3PID via home server
-Can bind and unbind 3PID via homeserver
-3PIDs are unbound after account deactivation
-Can bind and unbind 3PID via /unbind by specifying the identity server
-Can bind and unbind 3PID via /unbind without specifying the identity server