From eb2d0ebd09ee05cfe3b01dfdcfe27dd551268ac8 Mon Sep 17 00:00:00 2001 From: kb0rg Date: Tue, 23 May 2017 16:26:30 -0700 Subject: [PATCH] Add test for do_deactivate_realm exit if deactivated. Rename existing test_do_deactivate_realm to indicate test purpose is to confirm user realm cache clears when a realm is deactivated. --- zerver/tests/test_realm.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py index 1dfc259e64..09d6b4535e 100644 --- a/zerver/tests/test_realm.py +++ b/zerver/tests/test_realm.py @@ -128,7 +128,7 @@ class RealmTest(ZulipTestCase): # Since the setting fails silently, no message is returned self.assert_in_response("", result) - def test_do_deactivate_realm(self): + def test_do_deactivate_realm_clears_user_realm_cache(self): # type: () -> None """The main complicated thing about deactivating realm names is updating the cache, and we start by populating the cache for @@ -141,6 +141,18 @@ class RealmTest(ZulipTestCase): user = self.example_user('hamlet') self.assertTrue(user.realm.deactivated) + def test_do_deactivate_realm_on_deactived_realm(self): + # type: () -> None + """Ensure early exit is working in realm deactivation""" + realm = get_realm('zulip') + self.assertFalse(realm.deactivated) + + do_deactivate_realm(realm) + self.assertTrue(realm.deactivated) + + do_deactivate_realm(realm) + self.assertTrue(realm.deactivated) + def test_change_realm_default_language(self): # type: () -> None new_lang = "de"