From f5c26990c2f5d69da88d0748a44cc4c67ff867c4 Mon Sep 17 00:00:00 2001 From: Eeshan Garg Date: Wed, 1 Sep 2021 19:05:30 -0400 Subject: [PATCH] settings: Add constant for demo org deadlines. We set the 30 days deadline timedelta for demo orgs as a constant in default_settings.py so that it can be overridden in tests. --- zerver/lib/actions.py | 2 +- zerver/tests/test_signup.py | 4 +++- zproject/default_settings.py | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index af320bf0ec..ce77156f74 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -4964,7 +4964,7 @@ def do_create_realm( realm = Realm(string_id=string_id, name=name, **kwargs) if is_demo_organization: realm.demo_organization_scheduled_deletion_date = ( - realm.date_created + datetime.timedelta(days=30) + realm.date_created + datetime.timedelta(days=settings.DEMO_ORG_DEADLINE_DAYS) ) realm.save() diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index 46cceba320..9c178c4249 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -5180,7 +5180,9 @@ class UserSignUpTest(InviteUserBase): assert user_profile is not None self.assert_logged_in_user_id(user_profile.id) - expected_deletion_date = realm.date_created + datetime.timedelta(days=30) + expected_deletion_date = realm.date_created + datetime.timedelta( + days=settings.DEMO_ORG_DEADLINE_DAYS + ) self.assertEqual(realm.demo_organization_scheduled_deletion_date, expected_deletion_date) diff --git a/zproject/default_settings.py b/zproject/default_settings.py index c4295d5b26..3bd0ca1682 100644 --- a/zproject/default_settings.py +++ b/zproject/default_settings.py @@ -266,6 +266,9 @@ OPEN_REALM_CREATION = False # purpose now that the REALMS_HAVE_SUBDOMAINS migration is finished. SYSTEM_ONLY_REALMS = {"zulip"} +# Default deadline for demo organizations +DEMO_ORG_DEADLINE_DAYS = 30 + # Alternate hostnames to serve particular realms on, in addition to # their usual subdomains. Keys are realm string_ids (aka subdomains), # and values are alternate hosts.