summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-31 16:08:34 +0100
committerGitHub <noreply@github.com>2019-10-31 16:08:34 +0100
commit69489f8eb13f33ce79b2615deb3ac218a717792e (patch)
treec3f43273678f88b110ccdd906d7cf46a8ed26170 /tests/server.py
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parentNewsfile (diff)
downloadsynapse-69489f8eb13f33ce79b2615deb3ac218a717792e.tar.xz
Merge pull request #6307 from matrix-org/erikj/fix_purge_room
Fix /purge_room admin API
Diffstat (limited to 'tests/server.py')
-rw-r--r--tests/server.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/server.py b/tests/server.py
index e397ebe8fa..469efb4edb 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -161,7 +161,11 @@ def make_request(
         path = path.encode("ascii")
 
     # Decorate it to be the full path, if we're using shorthand
-    if shorthand and not path.startswith(b"/_matrix"):
+    if (
+        shorthand
+        and not path.startswith(b"/_matrix")
+        and not path.startswith(b"/_synapse")
+    ):
         path = b"/_matrix/client/r0/" + path
         path = path.replace(b"//", b"/")