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

api_auth: Use is_remote_server.

Browse Source
This commit is contained in:
Umair Khan
2017-04-28 09:56:44 +05:00
committed by Tim Abbott
parent faf190ff34
commit 10ed47156d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/test_classes.py
View File

@@ -18,6 +18,7 @@ from django.db.utils import IntegrityError
from zerver.lib.initial_password import initial_password from zerver.lib.initial_password import initial_password
from zerver.lib.db import TimeTrackingCursor from zerver.lib.db import TimeTrackingCursor
from zerver.lib.str_utils import force_text from zerver.lib.str_utils import force_text
from zerver.lib.utils import is_remote_server
from zerver.lib import cache from zerver.lib import cache
from zerver.tornado.handlers import allocate_handler_id from zerver.tornado.handlers import allocate_handler_id
from zerver.worker import queue_processors from zerver.worker import queue_processors
@@ -305,7 +306,7 @@ class ZulipTestCase(TestCase):
""" """
identifier: Can be an email or a remote server uuid. identifier: Can be an email or a remote server uuid.
""" """
if "@" not in identifier: if is_remote_server(identifier):
api_key = self.get_server_api_key(identifier) api_key = self.get_server_api_key(identifier)
else: else:
api_key = self.get_api_key(identifier) api_key = self.get_api_key(identifier)