summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-10-07 12:20:44 +0100
committerGitHub <noreply@github.com>2020-10-07 12:20:44 +0100
commit43c622885c94d0864ce4ff44ca3dfb753af88a6e (patch)
treec6b6e1bf84bc9aa923b5813841bfcf6cee214495 /tests
parentCombine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464) (diff)
parentupdate wording (diff)
downloadsynapse-43c622885c94d0864ce4ff44ca3dfb753af88a6e.tar.xz
Merge pull request #8463 from matrix-org/rav/clean_up_event_handling
Reduce inconsistencies between codepaths for membership and non-membership events.
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_register.py2
-rw-r--r--tests/unittest.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index cb7c0ed51a..702c6aa089 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -413,7 +413,7 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
             )
         )
         self.get_success(
-            event_creation_handler.send_nonmember_event(requester, event, context)
+            event_creation_handler.handle_new_client_event(requester, event, context)
         )
 
         # Register a second user, which won't be be in the room (or even have an invite)
diff --git a/tests/unittest.py b/tests/unittest.py
index 82ede9de34..5c87f6097e 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -608,7 +608,9 @@ class HomeserverTestCase(TestCase):
         if soft_failed:
             event.internal_metadata.soft_failed = True
 
-        self.get_success(event_creator.send_nonmember_event(requester, event, context))
+        self.get_success(
+            event_creator.handle_new_client_event(requester, event, context)
+        )
 
         return event.event_id