diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-08-26 17:26:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 17:26:56 +0100 |
| commit | b8f20e4276ea23dabcc3882dcee5773f856c39d0 (patch) | |
| tree | d3e873bdd253564b61934d114ad2b63cd219a3ad | |
| parent | Do not propagate typing notifications from shadow-banned users. (#8176) (diff) | |
| download | synapse-b8f20e4276ea23dabcc3882dcee5773f856c39d0.tar.xz | |
Remove remaining is_guest argument uses from get_room_data calls (#8181)
#8174 removed the `is_guest` parameter from `get_room_data`, at the same time that #8157 was merged using it, colliding together to break unit tests on develop. This PR removes the `is_guest` parameter from the call in the broken test. Uses the same changelog as #8174.
| -rw-r--r-- | changelog.d/8181.misc | 1 | ||||
| -rw-r--r-- | tests/rest/client/test_shadow_banned.py | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/changelog.d/8181.misc b/changelog.d/8181.misc new file mode 100644 index 0000000000..a39e9eab46 --- /dev/null +++ b/changelog.d/8181.misc @@ -0,0 +1 @@ +Remove unused `is_guest` parameter from, and add safeguard to, `MessageHandler.get_room_data`. \ No newline at end of file diff --git a/tests/rest/client/test_shadow_banned.py b/tests/rest/client/test_shadow_banned.py index 0c48a9fd5e..dfe4bf7762 100644 --- a/tests/rest/client/test_shadow_banned.py +++ b/tests/rest/client/test_shadow_banned.py @@ -271,11 +271,7 @@ class ProfileTestCase(_ShadowBannedBase): message_handler = self.hs.get_message_handler() event = self.get_success( message_handler.get_room_data( - self.banned_user_id, - room_id, - "m.room.member", - self.banned_user_id, - False, + self.banned_user_id, room_id, "m.room.member", self.banned_user_id, ) ) self.assertEqual( @@ -308,11 +304,7 @@ class ProfileTestCase(_ShadowBannedBase): message_handler = self.hs.get_message_handler() event = self.get_success( message_handler.get_room_data( - self.banned_user_id, - room_id, - "m.room.member", - self.banned_user_id, - False, + self.banned_user_id, room_id, "m.room.member", self.banned_user_id, ) ) self.assertEqual( |