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

test_narrow: Fix nondeterministic test failures with "lunch". 

We recently changed the populate_db data set to include more variable
message content, which happened to include the possibility of the word
"lunch" appearing in the test messages.  This caused occasional
failures of the search tests that looked for messages containing
"lunch" starting at the beginning of time, not the beginning of the
test.
This commit is contained in:
Tim Abbott 2017-08-15 09:20:45 -07:00
parent 4be814fc16
commit 3409806b88
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zerver/tests/test_narrow.py
View File

@ -764,6 +764,8 @@ class GetOldMessagesTest(ZulipTestCase):
('urltest', 'https://google.com'),
]
next_message_id = self.get_last_message().id + 1
for topic, content in messages_to_search:
self.send_message(
sender_name=self.example_email("cordelia"),
@ -781,7 +783,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(result['messages']), 2)
@ -790,7 +792,7 @@ class GetOldMessagesTest(ZulipTestCase):
narrow = [dict(operator='search', operand='https://google.com')]
link_search_result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(link_search_result['messages']), 1)
@ -821,7 +823,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
multi_search_result = self.get_and_check_messages(dict(
narrow=ujson.dumps(multi_search_narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(multi_search_result['messages']), 1)
@ -862,6 +864,8 @@ class GetOldMessagesTest(ZulipTestCase):
# type: () -> None
self.login(self.example_email("cordelia"))
next_message_id = self.get_last_message().id + 1
messages_to_search = [
(u'日本語', u'こんにちは。今日はいい天気ですね。'),
(u'日本語', u'今朝はごはんを食べました。'),
@ -895,7 +899,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(result['messages']), 4)
@ -930,7 +934,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
multi_search_result = self.get_and_check_messages(dict(
narrow=ujson.dumps(multi_search_narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(multi_search_result['messages']), 1)
@ -940,7 +944,7 @@ class GetOldMessagesTest(ZulipTestCase):
narrow = [dict(operator='search', operand='https://google.com')]
link_search_result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(link_search_result['messages']), 1)
@ -1390,6 +1394,7 @@ class GetOldMessagesTest(ZulipTestCase):
('say hello', 'How are you doing, @**Othello, the Moor of Venice**?'),
('lunch plans', 'I am hungry!'),
]
next_message_id = self.get_last_message().id + 1
for topic, content in messages_to_search:
self.send_message(
@ -1408,7 +1413,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
)) # type: Dict[str, Dict]
self.assertEqual(len(result['messages']), 0)
@ -1419,7 +1424,7 @@ class GetOldMessagesTest(ZulipTestCase):
]
result = self.get_and_check_messages(dict(
narrow=ujson.dumps(narrow),
anchor=0,
anchor=next_message_id,
num_after=10,
))
self.assertEqual(len(result['messages']), 1)