paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 16:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Message.objects.count() to speed up tests.

Browse Source 
(imported from commit dff1921b00a52929368d8a352f2ce8c05f63ec1f)
This commit is contained in:
Steve Howell
2013-07-02 09:53:48 -04:00
parent a989d5181f
commit a6ceb7dd11
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zephyr/tests.py
View File

@@ -70,6 +70,13 @@ def get_user_messages(user_profile):
order_by('message') order_by('message')
return [um.message for um in query] return [um.message for um in query]
def most_recent_message(user_profile):
query = UserMessage.objects. \
select_related("message"). \
filter(user_profile=user_profile). \
order_by('-message')
return query[0].message # Django does LIMIT here
def slow(expected_run_time, slowness_reason): def slow(expected_run_time, slowness_reason):
''' '''
This is a decorate that annotates a test as being "known This is a decorate that annotates a test as being "known
@@ -348,14 +355,14 @@ class PersonalMessagesTest(AuthedTestCase):
""" """
self.register("test", "test") self.register("test", "test")
user_profile = self.get_user_profile('test@humbughq.com') user_profile = self.get_user_profile('test@humbughq.com')
old_messages = self.message_stream(user_profile) old_messages_count = message_stream_count(user_profile)
self.send_message("test@humbughq.com", "test@humbughq.com", Recipient.PERSONAL) self.send_message("test@humbughq.com", "test@humbughq.com", Recipient.PERSONAL)
new_messages = self.message_stream(user_profile) new_messages_count = message_stream_count(user_profile)
self.assertEqual(len(new_messages) - len(old_messages), 1) self.assertEqual(new_messages_count, old_messages_count + 1)
recipient = Recipient.objects.get(type_id=user_profile.id, recipient = Recipient.objects.get(type_id=user_profile.id,
type=Recipient.PERSONAL) type=Recipient.PERSONAL)
self.assertEqual(new_messages[-1].recipient, recipient) self.assertEqual(most_recent_message(user_profile).recipient, recipient)
@slow(0.36, "checks several profiles") @slow(0.36, "checks several profiles")
def test_personal_to_self(self): def test_personal_to_self(self):
@@ -2780,12 +2787,12 @@ class GithubHookTests(AuthedTestCase):
# reason. # reason.
self.subscribe_to_stream(email, stream) self.subscribe_to_stream(email, stream)
prior_count = len(Message.objects.filter()) prior_count = Message.objects.count()
result = self.client.post(url, data) result = self.client.post(url, data)
self.assert_json_success(result) self.assert_json_success(result)
after_count = len(Message.objects.filter()) after_count = Message.objects.count()
self.assertEqual(prior_count, after_count) self.assertEqual(prior_count, after_count)