From 25c20a21bd0df82befed891d2e4b12505437380f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 7 Aug 2020 02:57:25 -0700 Subject: [PATCH] event_queue: Convert users argument of send_event to list. set is not JSON serializable, and orjson enforces this. Signed-off-by: Anders Kaseorg --- zerver/tests/test_bots.py | 4 ++-- zerver/tornado/event_queue.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py index b722b4ba4b..db1ad3fe96 100644 --- a/zerver/tests/test_bots.py +++ b/zerver/tests/test_bots.py @@ -429,7 +429,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin): ), event['event'], ) - self.assertEqual(event['users'], {user_profile.id}) + self.assertEqual(event['users'], [user_profile.id]) def test_add_bot_with_default_sending_stream_private_denied(self) -> None: self.login('hamlet') @@ -504,7 +504,7 @@ class BotTest(ZulipTestCase, UploadSerializeMixin): ), event['event'], ) - self.assertEqual(event['users'], {user_profile.id}) + self.assertEqual(event['users'], [user_profile.id]) def test_add_bot_with_default_events_register_stream_private_denied(self) -> None: self.login('hamlet') diff --git a/zerver/tornado/event_queue.py b/zerver/tornado/event_queue.py index d972d34ff8..490df63d51 100644 --- a/zerver/tornado/event_queue.py +++ b/zerver/tornado/event_queue.py @@ -1184,5 +1184,5 @@ def send_event(realm: Realm, event: Mapping[str, Any], the user/message pair.""" port = get_tornado_port(realm) queue_json_publish(notify_tornado_queue_name(port), - dict(event=event, users=users), + dict(event=event, users=list(users)), lambda *args, **kwargs: send_notification_http(realm, *args, **kwargs))