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

test_push_notifications: Fix type: ignore issues. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-06-22 22:00:30 -07:00 committed by Tim Abbott
parent feeb39a55f
commit 123b53ae86
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/tests/test_push_notifications.py
View File

@ -561,9 +561,14 @@ class AnalyticsBouncerTest(BouncerTestCase):
realm=user.realm, modified_user=user, event_type=RealmAuditLog.REALM_LOGO_CHANGED, realm=user.realm, modified_user=user, event_type=RealmAuditLog.REALM_LOGO_CHANGED,
event_time=self.TIME_ZERO, extra_data='data') event_time=self.TIME_ZERO, extra_data='data')
# send_analytics_to_remote_server calls send_to_push_bouncer twice.
# We need to distinguish the first and second calls.
first_call = True
def check_for_unwanted_data(*args: Any) -> Any: def check_for_unwanted_data(*args: Any) -> Any:
if check_for_unwanted_data.first_call: # type: ignore[attr-defined] nonlocal first_call
check_for_unwanted_data.first_call = False # type: ignore[attr-defined] if first_call:
first_call = False
else: else:
# Test that we're respecting SYNCED_BILLING_EVENTS # Test that we're respecting SYNCED_BILLING_EVENTS
self.assertIn(f'"event_type":{RealmAuditLog.USER_REACTIVATED}', str(args)) self.assertIn(f'"event_type":{RealmAuditLog.USER_REACTIVATED}', str(args))
@ -573,9 +578,6 @@ class AnalyticsBouncerTest(BouncerTestCase):
self.assertNotIn('modified_user', str(args)) self.assertNotIn('modified_user', str(args))
return send_to_push_bouncer(*args) return send_to_push_bouncer(*args)
# send_analytics_to_remote_server calls send_to_push_bouncer twice.
# We need to distinguish the first and second calls.
check_for_unwanted_data.first_call = True # type: ignore[attr-defined]
with mock.patch('zerver.lib.remote_server.send_to_push_bouncer', with mock.patch('zerver.lib.remote_server.send_to_push_bouncer',
side_effect=check_for_unwanted_data): side_effect=check_for_unwanted_data):
send_analytics_to_remote_server() send_analytics_to_remote_server()