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

test_push_notifications: Add assertLogs to verify logging in tests. 

This will prevent spam in test-backend output and test logging of logs
by the code being tested.
This commit is contained in:
Mohit Gupta 2020-07-25 19:36:25 +05:30 committed by Tim Abbott
parent d2520cd7e0
commit c4fe91af74
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/tests/test_push_notifications.py
View File

@ -176,11 +176,15 @@ class PushBouncerNotificationTest(BouncerTestCase):
hamlet = self.example_user('hamlet') hamlet = self.example_user('hamlet')
with self.assertLogs(level='WARNING') as warn_log:
result = self.api_post( result = self.api_post(
hamlet, hamlet,
endpoint, endpoint,
dict(user_id=user_id, token_kin=token_kind, token=token), dict(user_id=user_id, token_kin=token_kind, token=token),
) )
self.assertEqual(warn_log.output, [
'WARNING:root:User hamlet@zulip.com (zulip) attempted to access API on wrong subdomain ()'
])
self.assert_json_error(result, "Account is not associated with this subdomain", self.assert_json_error(result, "Account is not associated with this subdomain",
status_code=401) status_code=401)
@ -502,7 +506,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
subdomain="") subdomain="")
self.assert_json_error(result, "Data is out of order.") self.assert_json_error(result, "Data is out of order.")
with mock.patch("zilencer.views.validate_incoming_table_data"): with mock.patch("zilencer.views.validate_incoming_table_data"), self.assertLogs(level='WARNING') as warn_log:
# We need to wrap a transaction here to avoid the # We need to wrap a transaction here to avoid the
# IntegrityError that will be thrown in here from breaking # IntegrityError that will be thrown in here from breaking
# the unittest transaction. # the unittest transaction.
@ -515,6 +519,9 @@ class AnalyticsBouncerTest(BouncerTestCase):
'realmauditlog_rows': ujson.dumps(realmauditlog_data)}, 'realmauditlog_rows': ujson.dumps(realmauditlog_data)},
subdomain="") subdomain="")
self.assert_json_error(result, "Invalid data.") self.assert_json_error(result, "Invalid data.")
self.assertEqual(warn_log.output, [
'WARNING:root:Invalid data saving zilencer_remoteinstallationcount for server demo.example.com/1234-abcd'
])
@override_settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com') @override_settings(PUSH_NOTIFICATION_BOUNCER_URL='https://push.zulip.org.example.com')
@mock.patch('zerver.lib.remote_server.requests.request') @mock.patch('zerver.lib.remote_server.requests.request')