paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary uses of Realm.domain in zerver/tests.

Browse Source
This commit is contained in:
Rishi Gupta
2017-01-08 11:24:05 -08:00
committed by Tim Abbott
parent ac29928d91
commit 494c1a2b55
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tests/test_auth_backends.py
View File

@@ -1445,7 +1445,7 @@ class TestPasswordAuthEnabled(ZulipTestCase):
def test_password_auth_enabled_for_ldap(self): def test_password_auth_enabled_for_ldap(self):
# type: () -> None # type: () -> None
with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',)): with self.settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',)):
realm = Realm.objects.get(domain='zulip.com') realm = Realm.objects.get(string_id='zulip')
self.assertTrue(password_auth_enabled(realm)) self.assertTrue(password_auth_enabled(realm))
class TestMaybeSendToRegistration(ZulipTestCase): class TestMaybeSendToRegistration(ZulipTestCase):

2
zerver/tests/test_bugdown.py
View File

@@ -507,7 +507,7 @@ class BugdownTest(TestCase):
url_format_string='whatever') url_format_string='whatever')
realm_filter.save() realm_filter.save()
# start fresh for our domain # start fresh for our realm
flush() flush()
self.assertFalse(realm_in_local_realm_filters_cache(realm.id)) self.assertFalse(realm_in_local_realm_filters_cache(realm.id))

18
zerver/tests/test_export.py
View File

@@ -190,10 +190,9 @@ class ExportTest(TestCase):
mkdir_p(output_dir) mkdir_p(output_dir)
return output_dir return output_dir
def _export_realm(self, domain, exportable_user_ids=None): def _export_realm(self, realm, exportable_user_ids=None):
# type: (str, Set[int]) -> Dict[str, Any] # type: (Realm, Set[int]) -> Dict[str, Any]
output_dir = self._make_output_dir() output_dir = self._make_output_dir()
realm = Realm.objects.get(domain=domain)
with patch('logging.info'), patch('zerver.lib.export.create_soft_link'): with patch('logging.info'), patch('zerver.lib.export.create_soft_link'):
do_export_realm( do_export_realm(
realm=realm, realm=realm,
@@ -234,8 +233,8 @@ class ExportTest(TestCase):
is_message_realm_public=True is_message_realm_public=True
) )
domain = 'zulip.com' realm = Realm.objects.get(string_id='zulip')
full_data = self._export_realm(domain=domain) full_data = self._export_realm(realm)
data = full_data['attachment'] data = full_data['attachment']
self.assertEqual(len(data['zerver_attachment']), 1) self.assertEqual(len(data['zerver_attachment']), 1)
@@ -248,8 +247,8 @@ class ExportTest(TestCase):
def test_zulip_realm(self): def test_zulip_realm(self):
# type: () -> None # type: () -> None
domain = 'zulip.com' realm = Realm.objects.get(string_id='zulip')
full_data = self._export_realm(domain=domain) full_data = self._export_realm(realm)
data = full_data['realm'] data = full_data['realm']
self.assertEqual(len(data['zerver_userprofile_crossrealm']), 0) self.assertEqual(len(data['zerver_userprofile_crossrealm']), 0)
@@ -294,10 +293,7 @@ class ExportTest(TestCase):
hamlet = get_user_profile_by_email('hamlet@zulip.com') hamlet = get_user_profile_by_email('hamlet@zulip.com')
user_ids = set([cordelia.id, hamlet.id]) user_ids = set([cordelia.id, hamlet.id])
full_data = self._export_realm( full_data = self._export_realm(realm, exportable_user_ids=user_ids)
domain=domain,
exportable_user_ids=user_ids
)
data = full_data['realm'] data = full_data['realm']
exported_user_emails = get_set('zerver_userprofile', 'email') exported_user_emails = get_set('zerver_userprofile', 'email')
self.assertIn('cordelia@zulip.com', exported_user_emails) self.assertIn('cordelia@zulip.com', exported_user_emails)

3
zerver/tests/test_messages.py
View File

@@ -965,7 +965,6 @@ class MessagePOSTTest(ZulipTestCase):
create_mirrored_message_users_mock.return_value = (True, True) create_mirrored_message_users_mock.return_value = (True, True)
email = "starnine@mit.edu" email = "starnine@mit.edu"
user = get_user_profile_by_email(email) user = get_user_profile_by_email(email)
domain = user.realm.domain
user.realm.domain = 'not_mit.edu' user.realm.domain = 'not_mit.edu'
user.realm.save() user.realm.save()
self.login("starnine@mit.edu") self.login("starnine@mit.edu")
@@ -975,8 +974,6 @@ class MessagePOSTTest(ZulipTestCase):
"client": "zephyr_mirror", "client": "zephyr_mirror",
"to": "starnine@mit.edu"}, name='gownooo') "to": "starnine@mit.edu"}, name='gownooo')
self.assert_json_error(result, "Invalid mirrored realm") self.assert_json_error(result, "Invalid mirrored realm")
user.realm.domain = domain
user.realm.save()
class EditMessageTest(ZulipTestCase): class EditMessageTest(ZulipTestCase):
def check_message(self, msg_id, subject=None, content=None): def check_message(self, msg_id, subject=None, content=None):

8
zerver/tests/test_retention.py
View File

@@ -21,13 +21,13 @@ class TestRetentionLib(ZulipTestCase):
def setUp(self): def setUp(self):
# type: () -> None # type: () -> None
super(TestRetentionLib, self).setUp() super(TestRetentionLib, self).setUp()
self.zulip_realm = self._set_realm_message_retention_value('zulip.com', 30) self.zulip_realm = self._set_realm_message_retention_value('zulip', 30)
self.mit_realm = self._set_realm_message_retention_value('mit.edu', 100) self.mit_realm = self._set_realm_message_retention_value('mit', 100)
@staticmethod @staticmethod
def _set_realm_message_retention_value(domain, retention_period): def _set_realm_message_retention_value(realm_str, retention_period):
# type: (str, int) -> Realm # type: (str, int) -> Realm
realm = Realm.objects.filter(domain=domain).first() realm = Realm.objects.get(string_id=realm_str)
realm.message_retention_days = retention_period realm.message_retention_days = retention_period
realm.save() realm.save()
return realm return realm