paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 23:13:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

bot services: Use call_consume_in_tests.

Browse Source
This commit is contained in:
derAnfaenger
2017-10-18 19:51:27 +02:00
committed by Tim Abbott
parent 0473692abd
commit ce4ba9c178
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/actions.py
View File

@@ -1178,7 +1178,8 @@ def do_send_messages(messages_maybe_none):
"user_profile_id": event["user_profile_id"], "user_profile_id": event["user_profile_id"],
"failed_tries": 0, "failed_tries": 0,
}, },
lambda x: None lambda x: None,
call_consume_in_tests=True
) )
# Note that this does not preserve the order of message ids # Note that this does not preserve the order of message ids

12
zerver/tests/test_service_bot_system.py
View File

@@ -228,8 +228,8 @@ class TestServiceBotEventTriggers(ZulipTestCase):
trigger = 'mention' trigger = 'mention'
message_type = Recipient._type_names[Recipient.STREAM] message_type = Recipient._type_names[Recipient.STREAM]
def check_values_passed(queue_name, trigger_event, x): def check_values_passed(queue_name, trigger_event, x, call_consume_in_tests):
# type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None]) -> None # type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None], bool) -> None
self.assertEqual(queue_name, expected_queue_name) self.assertEqual(queue_name, expected_queue_name)
self.assertEqual(trigger_event["failed_tries"], 0) self.assertEqual(trigger_event["failed_tries"], 0)
self.assertEqual(trigger_event["message"]["content"], content) self.assertEqual(trigger_event["message"]["content"], content)
@@ -281,8 +281,8 @@ class TestServiceBotEventTriggers(ZulipTestCase):
recipient_email = self.bot_profile.email recipient_email = self.bot_profile.email
message_type = Recipient.PERSONAL message_type = Recipient.PERSONAL
def check_values_passed(queue_name, trigger_event, x): def check_values_passed(queue_name, trigger_event, x, call_consume_in_tests):
# type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None]) -> None # type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None], bool) -> None
self.assertEqual(queue_name, expected_queue_name) self.assertEqual(queue_name, expected_queue_name)
self.assertEqual(trigger_event["user_profile_id"], self.bot_profile.id) self.assertEqual(trigger_event["user_profile_id"], self.bot_profile.id)
self.assertEqual(trigger_event["trigger"], "private_message") self.assertEqual(trigger_event["trigger"], "private_message")
@@ -327,8 +327,8 @@ class TestServiceBotEventTriggers(ZulipTestCase):
message_type = Recipient.HUDDLE message_type = Recipient.HUDDLE
profile_ids = [self.bot_profile.id, self.second_bot_profile.id] profile_ids = [self.bot_profile.id, self.second_bot_profile.id]
def check_values_passed(queue_name, trigger_event, x): def check_values_passed(queue_name, trigger_event, x, call_consume_in_tests):
# type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None]) -> None # type: (Any, Union[Mapping[Any, Any], Any], Callable[[Any], None], bool) -> None
self.assertEqual(queue_name, expected_queue_name) self.assertEqual(queue_name, expected_queue_name)
self.assertIn(trigger_event["user_profile_id"], profile_ids) self.assertIn(trigger_event["user_profile_id"], profile_ids)
profile_ids.remove(trigger_event["user_profile_id"]) profile_ids.remove(trigger_event["user_profile_id"])