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

remote_billing: Fix two tests that shouldn't be asserting in a loop.

Browse Source 
It doesn't make sense to run a loop over "all" query results, when those
results are just two, and each of them has its own distinct asserts.

That for loop is there probably due to copying the structure of the
earlier test_transfer_legacy_plan_from_server_to_all_realms test, for
which the loop does make sense.
This commit is contained in:
Mateusz Mandera
2024-02-19 01:58:56 +01:00
committed by Tim Abbott
parent 68f02da82e
commit 1c61bb2fad
1 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
corporate/tests/test_remote_billing.py
View File

@@ -839,27 +839,38 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
["zephyr.testserver", "lear.testserver"], ["zephyr.testserver", "lear.testserver"],
) )
# Check legacy CustomerPlan exists for all realms except bot realm. # Check legacy CustomerPlan exists for the one non-deactivated "real" realm
for remote_realm in RemoteRealm.objects.filter(realm_deactivated=False): # and does not for the bot realm.
if remote_realm.is_system_bot_realm:
self.assertIsNone(get_customer_by_remote_realm(remote_realm))
continue
self.assertEqual(remote_realm.host, "zulip.testserver") # Sanity check that the setup for this test is the way we think it is.
customer = get_customer_by_remote_realm(remote_realm) self.assertEqual(RemoteRealm.objects.filter(realm_deactivated=False).count(), 2)
assert customer is not None # These queries have a unique result, so we can use .get().
# Customer got transferred from server to realm. remote_realm_with_plan = RemoteRealm.objects.get(
self.assertEqual(customer, server_customer) realm_deactivated=False, is_system_bot_realm=False
plan = get_current_plan_by_customer(customer) )
assert plan is not None system_bot_remote_realm = RemoteRealm.objects.get(
self.assertEqual(remote_realm.plan_type, RemoteRealm.PLAN_TYPE_SELF_MANAGED_LEGACY) realm_deactivated=False, is_system_bot_realm=True
self.assertEqual(plan.tier, CustomerPlan.TIER_SELF_HOSTED_LEGACY) )
self.assertEqual(plan.status, CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END)
self.assertEqual(plan.billing_cycle_anchor, start_date) self.assertIsNone(get_customer_by_remote_realm(system_bot_remote_realm))
self.assertEqual(plan.end_date, end_date)
self.assertEqual( self.assertEqual(remote_realm_with_plan.host, "zulip.testserver")
RemoteRealmBillingSession(remote_realm).get_next_plan(plan), server_next_plan customer = get_customer_by_remote_realm(remote_realm_with_plan)
) assert customer is not None
# Customer got transferred from server to realm.
self.assertEqual(customer, server_customer)
plan = get_current_plan_by_customer(customer)
assert plan is not None
self.assertEqual(
remote_realm_with_plan.plan_type, RemoteRealm.PLAN_TYPE_SELF_MANAGED_LEGACY
)
self.assertEqual(plan.tier, CustomerPlan.TIER_SELF_HOSTED_LEGACY)
self.assertEqual(plan.status, CustomerPlan.SWITCH_PLAN_TIER_AT_PLAN_END)
self.assertEqual(plan.billing_cycle_anchor, start_date)
self.assertEqual(plan.end_date, end_date)
self.assertEqual(
RemoteRealmBillingSession(remote_realm_with_plan).get_next_plan(plan), server_next_plan
)
@responses.activate @responses.activate
def test_transfer_business_plan_from_server_to_realm( def test_transfer_business_plan_from_server_to_realm(
@@ -936,21 +947,29 @@ class RemoteBillingAuthenticationTest(RemoteRealmBillingTestCase):
self.assertEqual(self.server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED) self.assertEqual(self.server.plan_type, RemoteZulipServer.PLAN_TYPE_SELF_MANAGED)
# Check business CustomerPlan exists for all realms except bot realm. # Check business CustomerPlan exists for all realms except bot realm.
for remote_realm in RemoteRealm.objects.filter(realm_deactivated=False):
if remote_realm.is_system_bot_realm:
self.assertIsNone(get_customer_by_remote_realm(remote_realm))
continue
self.assertEqual(remote_realm.host, "zulip.testserver") # Sanity check that the setup for this test is the way we think it is.
customer = get_customer_by_remote_realm(remote_realm) self.assertEqual(RemoteRealm.objects.filter(realm_deactivated=False).count(), 2)
assert customer is not None # These queries have a unique result, so we can use .get().
# Customer got transferred from server to realm. remote_realm_with_plan = RemoteRealm.objects.get(
self.assertEqual(customer, server_customer) realm_deactivated=False, is_system_bot_realm=False
plan = get_current_plan_by_customer(customer) )
assert plan is not None system_bot_remote_realm = RemoteRealm.objects.get(
self.assertEqual(remote_realm.plan_type, RemoteRealm.PLAN_TYPE_BUSINESS) realm_deactivated=False, is_system_bot_realm=True
self.assertEqual(plan.tier, CustomerPlan.TIER_SELF_HOSTED_BUSINESS) )
self.assertEqual(plan.status, CustomerPlan.ACTIVE)
self.assertIsNone(get_customer_by_remote_realm(system_bot_remote_realm))
self.assertEqual(remote_realm_with_plan.host, "zulip.testserver")
customer = get_customer_by_remote_realm(remote_realm_with_plan)
assert customer is not None
# Customer got transferred from server to realm.
self.assertEqual(customer, server_customer)
plan = get_current_plan_by_customer(customer)
assert plan is not None
self.assertEqual(remote_realm_with_plan.plan_type, RemoteRealm.PLAN_TYPE_BUSINESS)
self.assertEqual(plan.tier, CustomerPlan.TIER_SELF_HOSTED_BUSINESS)
self.assertEqual(plan.status, CustomerPlan.ACTIVE)
@responses.activate @responses.activate
def test_transfer_plan_from_server_to_realm_edge_cases(self) -> None: def test_transfer_plan_from_server_to_realm_edge_cases(self) -> None: