paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote_realm: Add syncing of org_type.

Browse Source
This commit is contained in:
Mateusz Mandera
2023-11-27 02:06:23 +01:00
committed by Tim Abbott
parent e276812e42
commit 02d5740f0f
7 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zerver/tests/test_push_notifications.py
View File

@@ -979,6 +979,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
"uuid",
"uuid_owner_secret",
"host",
"org_type",
"realm_date_created",
"registration_deactivated",
"realm_deactivated",
@@ -991,6 +992,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
"uuid": realm.uuid,
"uuid_owner_secret": realm.uuid_owner_secret,
"host": realm.host,
"org_type": realm.org_type,
"realm_date_created": realm.date_created,
"registration_deactivated": False,
"realm_deactivated": False,
@@ -1160,6 +1162,26 @@ class AnalyticsBouncerTest(BouncerTestCase):
# Only the request counts go up -- all of the other rows' duplicates are dropped
check_counts(10, 8, 3, 2, 5)
# Test that only valid org_type values are accepted - integers defined in OrgTypeEnum.
realms_data = [dict(realm) for realm in get_realms_info_for_push_bouncer()]
# Not a valid org_type value:
realms_data[0]["org_type"] = 11
result = self.uuid_post(
self.server_uuid,
"/api/v1/remotes/server/analytics",
{
"realm_counts": orjson.dumps([]).decode(),
"installation_counts": orjson.dumps([]).decode(),
"realmauditlog_rows": orjson.dumps([]).decode(),
"realms": orjson.dumps(realms_data).decode(),
},
subdomain="",
)
self.assert_json_error(
result, 'Invalid realms[0]["org_type"]: Value error, Not a valid org_type value'
)
@override_settings(PUSH_NOTIFICATION_BOUNCER_URL="https://push.zulip.org.example.com")
@responses.activate
def test_analytics_api_invalid(self) -> None: