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

test_push_notifications: Use self.server instead of .get expression. 

It makes no sense to do RemoteZulipServer.objects.get with
self.server_uuid, when there simply is self.server.
This commit is contained in:
Mateusz Mandera 2023-12-22 02:29:00 +01:00 committed by Tim Abbott
parent 82ee93d967
commit d3e8ddd6ce
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
zerver/tests/test_push_notifications.py
View File

@ -289,7 +289,7 @@ class SendTestPushNotificationEndpointTest(BouncerTestCase):
self.add_mock_response() self.add_mock_response()
user = self.example_user("cordelia") user = self.example_user("cordelia")
server = RemoteZulipServer.objects.get(uuid=self.server_uuid) server = self.server
token = "111222" token = "111222"
token_kind = PushDeviceToken.GCM token_kind = PushDeviceToken.GCM
@ -605,7 +605,7 @@ class PushBouncerNotificationTest(BouncerTestCase):
def test_send_notification_endpoint(self) -> None: def test_send_notification_endpoint(self) -> None:
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")
server = RemoteZulipServer.objects.get(uuid=self.server_uuid) server = self.server
token = "aaaa" token = "aaaa"
android_tokens = [] android_tokens = []
uuid_android_tokens = [] uuid_android_tokens = []
@ -713,7 +713,7 @@ class PushBouncerNotificationTest(BouncerTestCase):
def test_send_notification_endpoint_on_free_plans(self) -> None: def test_send_notification_endpoint_on_free_plans(self) -> None:
hamlet = self.example_user("hamlet") hamlet = self.example_user("hamlet")
remote_server = RemoteZulipServer.objects.get(uuid=self.server_uuid) remote_server = self.server
RemotePushDeviceToken.objects.create( RemotePushDeviceToken.objects.create(
kind=RemotePushDeviceToken.GCM, kind=RemotePushDeviceToken.GCM,
token=hex_to_b64("aaaaaa"), token=hex_to_b64("aaaaaa"),
@ -921,7 +921,7 @@ class PushBouncerNotificationTest(BouncerTestCase):
kind=RemotePushDeviceToken.GCM, kind=RemotePushDeviceToken.GCM,
token=hex_to_b64("aaaaaa"), token=hex_to_b64("aaaaaa"),
user_id=hamlet.id, user_id=hamlet.id,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
time_sent = now().replace(microsecond=234000) time_sent = now().replace(microsecond=234000)
@ -1123,7 +1123,7 @@ class PushBouncerNotificationTest(BouncerTestCase):
self.add_mock_response() self.add_mock_response()
user = self.example_user("cordelia") user = self.example_user("cordelia")
self.login_user(user) self.login_user(user)
server = RemoteZulipServer.objects.get(uuid=self.server_uuid) server = self.server
endpoints: List[Tuple[str, str, int, Mapping[str, str]]] = [ endpoints: List[Tuple[str, str, int, Mapping[str, str]]] = [
( (
@ -1396,7 +1396,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
self.add_mock_response() self.add_mock_response()
# Send any existing data over, so that we can start the test with a "clean" slate # Send any existing data over, so that we can start the test with a "clean" slate
remote_server = RemoteZulipServer.objects.get(uuid=self.server_uuid) remote_server = self.server
assert remote_server is not None assert remote_server is not None
assert remote_server.last_version is None assert remote_server.last_version is None
@ -1407,7 +1407,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
assert audit_log is not None assert audit_log is not None
audit_log_max_id = audit_log.id audit_log_max_id = audit_log.id
remote_server = RemoteZulipServer.objects.get(uuid=self.server_uuid) remote_server.refresh_from_db()
assert remote_server.last_version == ZULIP_VERSION assert remote_server.last_version == ZULIP_VERSION
remote_audit_log_count = RemoteRealmAuditLog.objects.count() remote_audit_log_count = RemoteRealmAuditLog.objects.count()
@ -2494,14 +2494,14 @@ class PushNotificationTest(BouncerTestCase):
token=hex_to_b64(id_token), token=hex_to_b64(id_token),
ios_app_id=appid, ios_app_id=appid,
user_id=self.user_profile.id, user_id=self.user_profile.id,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
RemotePushDeviceToken.objects.create( RemotePushDeviceToken.objects.create(
kind=RemotePushDeviceToken.APNS, kind=RemotePushDeviceToken.APNS,
token=hex_to_b64(uuid_token), token=hex_to_b64(uuid_token),
ios_app_id=appid, ios_app_id=appid,
user_uuid=self.user_profile.uuid, user_uuid=self.user_profile.uuid,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
def setup_gcm_tokens(self) -> None: def setup_gcm_tokens(self) -> None:
@ -2520,13 +2520,13 @@ class PushNotificationTest(BouncerTestCase):
kind=RemotePushDeviceToken.GCM, kind=RemotePushDeviceToken.GCM,
token=hex_to_b64(id_token), token=hex_to_b64(id_token),
user_id=self.user_profile.id, user_id=self.user_profile.id,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
RemotePushDeviceToken.objects.create( RemotePushDeviceToken.objects.create(
kind=RemotePushDeviceToken.GCM, kind=RemotePushDeviceToken.GCM,
token=hex_to_b64(uuid_token), token=hex_to_b64(uuid_token),
user_uuid=self.user_profile.uuid, user_uuid=self.user_profile.uuid,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
@ -3524,7 +3524,7 @@ class TestAPNs(PushNotificationTest):
token="1234", token="1234",
ios_app_id=None, ios_app_id=None,
user_id=self.user_profile.id, user_id=self.user_profile.id,
server=RemoteZulipServer.objects.get(uuid=self.server_uuid), server=self.server,
) )
with self.mock_apns() as (apns_context, send_notification), self.assertLogs( with self.mock_apns() as (apns_context, send_notification), self.assertLogs(
"zerver.lib.push_notifications", level="INFO" "zerver.lib.push_notifications", level="INFO"