summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-12-02 20:08:46 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-02 20:08:46 +0000
commit269ba1bc847b1df27e5ebba3d8cd1954a57561e4 (patch)
tree6a57f03750897cf5b97d8188e497f54ce104581c /tests/server.py
parentchangelog (diff)
parentMerge pull request #8858 from matrix-org/rav/sso_uia (diff)
downloadsynapse-269ba1bc847b1df27e5ebba3d8cd1954a57561e4.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/remove_unused_mocks
Diffstat (limited to 'tests/server.py')
-rw-r--r--tests/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/server.py b/tests/server.py
index a51ad0c14e..4faf32e335 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -216,8 +216,9 @@ def make_request(
         and not path.startswith(b"/_matrix")
         and not path.startswith(b"/_synapse")
     ):
+        if path.startswith(b"/"):
+            path = path[1:]
         path = b"/_matrix/client/r0/" + path
-        path = path.replace(b"//", b"/")
 
     if not path.startswith(b"/"):
         path = b"/" + path
@@ -258,6 +259,7 @@ def make_request(
         for k, v in custom_headers:
             req.requestHeaders.addRawHeader(k, v)
 
+    req.parseCookies()
     req.requestReceived(method, path, b"1.1")
 
     if await_result: