diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /tests/server.py | |
parent | Newsfile (diff) | |
parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'tests/server.py')
-rw-r--r-- | tests/server.py | 6 |
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"/") |