Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_messages: Fix list ordering flake in test_wildcard_mention. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-12-02 18:08:36 -08:00 committed by Anders Kaseorg
parent b5307b1b5a
commit 7d5450917a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/tests/test_messages.py
View File

@ -106,6 +106,7 @@ from analytics.models import RealmCount
import datetime import datetime
import mock import mock
from operator import itemgetter
import time import time
import ujson import ujson
from typing import Any, Dict, List, Optional, Set, Union from typing import Any, Dict, List, Optional, Set, Union
@ -2990,7 +2991,7 @@ class EditMessageTest(ZulipTestCase):
"flags": ["wildcard_mentioned"] "flags": ["wildcard_mentioned"]
} }
users_to_be_notified = list(map(notify, [cordelia.id, hamlet.id])) users_to_be_notified = sorted(map(notify, [cordelia.id, hamlet.id]), key=itemgetter("id"))
result = self.client_patch("/json/messages/" + str(message_id), { result = self.client_patch("/json/messages/" + str(message_id), {
'message_id': message_id, 'message_id': message_id,
'content': 'Hello @**everyone**', 'content': 'Hello @**everyone**',
@ -3005,7 +3006,7 @@ class EditMessageTest(ZulipTestCase):
if arg_event['type'] == 'update_message': if arg_event['type'] == 'update_message':
self.assertEqual(arg_event['type'], 'update_message') self.assertEqual(arg_event['type'], 'update_message')
self.assertEqual(arg_event['wildcard_mention_user_ids'], [cordelia.id, hamlet.id]) self.assertEqual(arg_event['wildcard_mention_user_ids'], [cordelia.id, hamlet.id])
self.assertEqual(arg_notified_users, users_to_be_notified) self.assertEqual(sorted(arg_notified_users, key=itemgetter("id")), users_to_be_notified)
called = True called = True
self.assertTrue(called) self.assertTrue(called)