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

typing tests: Add query_count checks. 

We should not need so many queries here,
although a couple of the queries are just
standard things that apply to all requests.

I will reduce the number of queries in a
later commit.
This commit is contained in:
Steve Howell 2020-02-23 16:24:41 +00:00 committed by Tim Abbott
parent 995353fb28
commit 600fcd6c52
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zerver/tests/test_typing.py
View File

@ -7,7 +7,10 @@ from django.conf import settings
from django.core.exceptions import ValidationError
from zerver.lib.actions import recipient_for_user_ids
from zerver.lib.test_helpers import tornado_redirected_to_list
from zerver.lib.test_helpers import (
tornado_redirected_to_list,
queries_captured,
)
from zerver.lib.test_classes import (
ZulipTestCase,
)
@ -90,19 +93,19 @@ class TypingNotificationRecipientsTest(ZulipTestCase):
expected_recipient_emails = set([user.email for user in expected_recipients])
expected_recipient_ids = set([user.id for user in expected_recipients])
params = dict(
to=ujson.dumps([recipient_user.id]),
op='start',
)
events = [] # type: List[Mapping[str, Any]]
with tornado_redirected_to_list(events):
result = self.api_post(
sender.email,
'/api/v1/typing',
{
'to': ujson.dumps([recipient_user.id]),
'op': 'start'
}
)
with queries_captured() as queries:
with tornado_redirected_to_list(events):
result = self.api_post(sender.email, '/api/v1/typing', params)
self.assert_json_success(result)
self.assertEqual(len(events), 1)
self.assertEqual(len(queries), 8)
event = events[0]['event']
event_recipient_emails = set(user['email'] for user in event['recipients'])
@ -156,12 +159,18 @@ class TypingNotificationRecipientsTest(ZulipTestCase):
expected_recipient_emails = set([user.email for user in expected_recipients])
expected_recipient_ids = set([user.id for user in expected_recipients])
events = [] # type: List[Mapping[str, Any]]
with tornado_redirected_to_list(events):
result = self.api_post(sender.email, '/api/v1/typing',
{'to': ujson.dumps([user.id for user in recipient_users]),
'op': 'start'})
params = dict(
to=ujson.dumps([user.id for user in recipient_users]),
op='start',
)
with queries_captured() as queries:
with tornado_redirected_to_list(events):
result = self.api_post(sender.email, '/api/v1/typing', params)
self.assert_json_success(result)
self.assertEqual(len(events), 1)
self.assertEqual(len(queries), 15)
event = events[0]['event']
event_recipient_emails = set(user['email'] for user in event['recipients'])