summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:44:29 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-03-11 17:44:29 +0000
commitf18dca26daad4b7114716b17b4a9f36a1989f16a (patch)
tree73035f6cf11594d02089b5b990be673d7c7849e5 /tests
parentMerge branch 'develop' into anoa/trailing_slashes_client (diff)
parentMake federation endpoints more tolerant of trailing slashes for some endpoint... (diff)
downloadsynapse-f18dca26daad4b7114716b17b4a9f36a1989f16a.tar.xz
Merge branch 'develop' into anoa/trailing_slashes_client
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_typing.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 13486930fb..b8e97390de 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -180,7 +180,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
         put_json = self.hs.get_http_client().put_json
         put_json.assert_called_once_with(
             "farm",
-            path="/_matrix/federation/v1/send/1000000/",
+            path="/_matrix/federation/v1/send/1000000",
             data=_expect_edu_transaction(
                 "m.typing",
                 content={
@@ -201,7 +201,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
 
         (request, channel) = self.make_request(
             "PUT",
-            "/_matrix/federation/v1/send/1000000/",
+            "/_matrix/federation/v1/send/1000000",
             _make_edu_transaction_json(
                 "m.typing",
                 content={
@@ -257,7 +257,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
         put_json = self.hs.get_http_client().put_json
         put_json.assert_called_once_with(
             "farm",
-            path="/_matrix/federation/v1/send/1000000/",
+            path="/_matrix/federation/v1/send/1000000",
             data=_expect_edu_transaction(
                 "m.typing",
                 content={