From b8f20e4276ea23dabcc3882dcee5773f856c39d0 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Wed, 26 Aug 2020 17:26:56 +0100
Subject: [PATCH] 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.
---
changelog.d/8181.misc | 1 +
tests/rest/client/test_shadow_banned.py | 12 ++----------
2 files changed, 3 insertions(+), 10 deletions(-)
create mode 100644 changelog.d/8181.misc
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(
--
GitLab