summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-09-28 21:29:29 -0500
committerEric Eastwood <erice@element.io>2022-09-28 21:29:29 -0500
commit1ed0276abfa5b3c4c98301464a80bf9de2a37e13 (patch)
treecc37b24096b24d094692152d0601e438382d6c95
parentSimplify case (diff)
downloadsynapse-1ed0276abfa5b3c4c98301464a80bf9de2a37e13.tar.xz
Simplify case more (no more alice)
-rw-r--r--tests/handlers/test_federation_event.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/handlers/test_federation_event.py b/tests/handlers/test_federation_event.py
index 8d37530d7b..aab3736f04 100644
--- a/tests/handlers/test_federation_event.py
+++ b/tests/handlers/test_federation_event.py
@@ -961,16 +961,11 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
         )
         room_version = self.get_success(main_store.get_room_version(room_id))
 
-        user_alice = self.register_user("alice", "pass")
-        alice_membership_event = self.get_success(
-            event_injection.inject_member_event(self.hs, room_id, user_alice, "join")
-        )
-
         event_before = self.get_success(
             inject_event(
                 self.hs,
                 room_id=room_id,
-                sender=user_alice,
+                sender=room_creator,
                 type=EventTypes.Message,
                 content={"body": "eventBefore0", "msgtype": "m.text"},
             )
@@ -981,7 +976,7 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
             inject_event(
                 self.hs,
                 room_id=room_id,
-                sender=user_alice,
+                sender=room_creator,
                 type=EventTypes.Message,
                 content={"body": "eventAfter0", "msgtype": "m.text"},
             )
@@ -1089,7 +1084,6 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
         #     as_membership_event,
         #     state_map.get((EventTypes.JoinRules, "")),
         #     state_map.get((EventTypes.RoomHistoryVisibility, "")),
-        #     alice_membership_event,
         #     event_before,
         #     # HISTORICAL MESSAGE END
         #     insertion_event,
@@ -1112,7 +1106,6 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
             as_membership_event,
             state_map.get((EventTypes.JoinRules, "")),
             state_map.get((EventTypes.RoomHistoryVisibility, "")),
-            alice_membership_event,
             event_before,
             event_after,
             base_insertion_event,
@@ -1173,7 +1166,6 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
             pl_event,
             state_map.get((EventTypes.JoinRules, "")),
             state_map.get((EventTypes.RoomHistoryVisibility, "")),
-            alice_membership_event,
             event_before,
             # HISTORICAL MESSAGE END
             insertion_event,