Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use make_stream() in test_messages.py.

This commit is contained in:
Steve Howell 2016-10-21 13:59:28 -07:00 committed by Tim Abbott
parent 0861421912
commit b1ebb09c96
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zerver/tests/test_messages.py
View File

@ -32,7 +32,6 @@ from zerver.models import (
from zerver.lib.actions import ( from zerver.lib.actions import (
check_message, check_send_message, check_message, check_send_message,
create_stream_if_needed,
do_create_user, do_create_user,
get_client, get_client,
) )
@ -427,7 +426,7 @@ class StreamMessagesTest(ZulipTestCase):
# Subscribe everyone to a stream with non-ASCII characters. # Subscribe everyone to a stream with non-ASCII characters.
non_ascii_stream_name = u"hümbüǵ" non_ascii_stream_name = u"hümbüǵ"
realm = get_realm("zulip.com") realm = get_realm("zulip.com")
stream, _ = create_stream_if_needed(realm, non_ascii_stream_name) stream = self.make_stream(non_ascii_stream_name)
for user_profile in UserProfile.objects.filter(realm=realm): for user_profile in UserProfile.objects.filter(realm=realm):
self.subscribe_to_stream(user_profile.email, stream.name) self.subscribe_to_stream(user_profile.email, stream.name)
@ -438,11 +437,11 @@ class MessageDictTest(ZulipTestCase):
@slow('builds lots of messages') @slow('builds lots of messages')
def test_bulk_message_fetching(self): def test_bulk_message_fetching(self):
# type: () -> None # type: () -> None
realm = get_realm("zulip.com")
sender = get_user_profile_by_email('othello@zulip.com') sender = get_user_profile_by_email('othello@zulip.com')
receiver = get_user_profile_by_email('hamlet@zulip.com') receiver = get_user_profile_by_email('hamlet@zulip.com')
pm_recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL) pm_recipient = Recipient.objects.get(type_id=receiver.id, type=Recipient.PERSONAL)
stream, _ = create_stream_if_needed(realm, 'devel') stream_name = u'Çiğdem'
stream = self.make_stream(stream_name)
stream_recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM) stream_recipient = Recipient.objects.get(type_id=stream.id, type=Recipient.STREAM)
sending_client = make_client(name="test suite") sending_client = make_client(name="test suite")
@ -850,7 +849,7 @@ class EditMessageTest(ZulipTestCase):
# type: () -> None # type: () -> None
email = "hamlet@zulip.com" email = "hamlet@zulip.com"
self.login(email) self.login(email)
stream, _ = create_stream_if_needed(get_realm("zulip.com"), 'public_stream') stream = self.make_stream('public_stream')
self.subscribe_to_stream(email, stream.name) self.subscribe_to_stream(email, stream.name)
msg_id = self.send_message(email, stream.name, Recipient.STREAM, msg_id = self.send_message(email, stream.name, Recipient.STREAM,
subject="test", content="test") subject="test", content="test")
@ -865,7 +864,7 @@ class EditMessageTest(ZulipTestCase):
# type: () -> None # type: () -> None
email = "hamlet@zulip.com" email = "hamlet@zulip.com"
self.login(email) self.login(email)
stream, _ = create_stream_if_needed(get_realm("zulip.com"), 'private_stream', invite_only=True) stream = self.make_stream('private_stream', invite_only=True)
self.subscribe_to_stream(email, stream.name) self.subscribe_to_stream(email, stream.name)
msg_id = self.send_message(email, stream.name, Recipient.STREAM, msg_id = self.send_message(email, stream.name, Recipient.STREAM,
subject="test", content="test") subject="test", content="test")
@ -1310,7 +1309,7 @@ class StarTests(ZulipTestCase):
def test_change_star_private_stream_security(self): def test_change_star_private_stream_security(self):
# type: () -> None # type: () -> None
stream_name = "private_stream" stream_name = "private_stream"
create_stream_if_needed(get_realm("zulip.com"), stream_name, invite_only=True) self.make_stream(stream_name, invite_only=True)
self.subscribe_to_stream("hamlet@zulip.com", stream_name) self.subscribe_to_stream("hamlet@zulip.com", stream_name)
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
message_ids = [self.send_message("hamlet@zulip.com", stream_name, message_ids = [self.send_message("hamlet@zulip.com", stream_name,
@ -1424,8 +1423,8 @@ class CheckMessageTest(ZulipTestCase):
# type: () -> None # type: () -> None
sender = get_user_profile_by_email('othello@zulip.com') sender = get_user_profile_by_email('othello@zulip.com')
client = make_client(name="test suite") client = make_client(name="test suite")
stream_name = 'integration' stream_name = u'España y Francia'
stream, _ = create_stream_if_needed(get_realm("zulip.com"), stream_name) self.make_stream(stream_name)
message_type_name = 'stream' message_type_name = 'stream'
message_to = None message_to = None
message_to = [stream_name] message_to = [stream_name]
@ -1454,8 +1453,8 @@ class CheckMessageTest(ZulipTestCase):
sender = bot sender = bot
client = make_client(name="test suite") client = make_client(name="test suite")
stream_name = 'integration' stream_name = u'Россия'
stream, _ = create_stream_if_needed(get_realm("zulip.com"), stream_name) self.make_stream(stream_name)
message_type_name = 'stream' message_type_name = 'stream'
message_to = None message_to = None
message_to = [stream_name] message_to = [stream_name]