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

test_presence: Fix nondeterministic test failures. 

Apparently, the bug here was that we were aliasing the user_profile
variable, so that the results depended on what the last iteration in
the loop landed on.
This commit is contained in:
Tim Abbott 2018-05-20 22:01:55 -07:00
parent a170bd70af
commit 9b8331cf88
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/tests/test_presence.py
View File

@ -33,15 +33,14 @@ import datetime
class ActivityTest(ZulipTestCase): class ActivityTest(ZulipTestCase):
def test_activity(self) -> None: def test_activity(self) -> None:
user_profile = self.example_user("hamlet") self.login(self.example_email("hamlet"))
self.login(user_profile.email)
client, _ = Client.objects.get_or_create(name='website') client, _ = Client.objects.get_or_create(name='website')
query = '/json/users/me/pointer' query = '/json/users/me/pointer'
last_visit = timezone_now() last_visit = timezone_now()
count = 150 count = 150
for user_profile in UserProfile.objects.all(): for activity_user_profile in UserProfile.objects.all():
UserActivity.objects.get_or_create( UserActivity.objects.get_or_create(
user_profile=user_profile, user_profile=activity_user_profile,
client=client, client=client,
query=query, query=query,
count=count, count=count,
@ -52,17 +51,13 @@ class ActivityTest(ZulipTestCase):
result = self.client_get('/activity') result = self.client_get('/activity')
self.assertEqual(result.status_code, 302) self.assertEqual(result.status_code, 302)
user_profile = self.example_user("hamlet")
user_profile.is_staff = True user_profile.is_staff = True
user_profile.save() user_profile.save()
flush_per_request_caches() flush_per_request_caches()
with queries_captured() as queries: with queries_captured() as queries:
result = self.client_get('/activity') result = self.client_get('/activity')
if result.status_code == 302: # nocoverage
# Debug data for a request we're trying to track down
print(result)
print(result.url)
print(self.example_user("hamlet").is_staff)
self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200)
self.assert_length(queries, 13) self.assert_length(queries, 13)