From 098569ccb47c93201d22f466133bea97910bb5cb Mon Sep 17 00:00:00 2001
From: Vishnu Ks <hackerkid@vishnuks.com>
Date: Thu, 13 Jul 2017 00:40:18 +0530
Subject: [PATCH] test_classes: Use get_user in unsubscribe_from_stream.

---
 zerver/lib/test_classes.py |  8 ++++----
 zerver/tests/test_bots.py  | 24 ++++++++++++------------
 zerver/tests/test_subs.py  |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/zerver/lib/test_classes.py b/zerver/lib/test_classes.py
index 3880ed3f0a..97b067f09f 100644
--- a/zerver/lib/test_classes.py
+++ b/zerver/lib/test_classes.py
@@ -496,10 +496,10 @@ class ZulipTestCase(TestCase):
         bulk_add_subscriptions([stream], [user_profile], from_creation=from_creation)
         return stream
 
-    def unsubscribe_from_stream(self, email, stream_name):
-        # type: (Text, Text) -> None
-        user_profile = get_user_profile_by_email(email)
-        stream = get_stream(stream_name, user_profile.realm)
+    def unsubscribe_from_stream(self, email, stream_name, realm):
+        # type: (Text, Text, Realm) -> None
+        user_profile = get_user(email, realm)
+        stream = get_stream(stream_name, realm)
         bulk_remove_subscriptions([user_profile], [stream])
 
     # Subscribe to a stream by making an API request
diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py
index 0bfce740fa..80d909acda 100644
--- a/zerver/tests/test_bots.py
+++ b/zerver/tests/test_bots.py
@@ -298,9 +298,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
     def test_add_bot_with_default_sending_stream_private_denied(self):
         # type: () -> None
         self.login(self.example_email('hamlet'))
-        user_profile = self.example_user('hamlet')
-        stream = get_stream("Denmark", user_profile.realm)
-        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark")
+        realm = self.example_user('hamlet').realm
+        stream = get_stream("Denmark", realm)
+        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
         do_change_stream_invite_only(stream, True)
 
         bot_info = {
@@ -368,9 +368,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
     def test_add_bot_with_default_events_register_stream_private_denied(self):
         # type: () -> None
         self.login(self.example_email('hamlet'))
-        user_profile = self.example_user('hamlet')
-        stream = get_stream("Denmark", user_profile.realm)
-        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark")
+        realm = self.example_user('hamlet').realm
+        stream = get_stream("Denmark", realm)
+        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
         do_change_stream_invite_only(stream, True)
 
         self.assert_num_bots_equal(0)
@@ -710,9 +710,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
     def test_patch_bot_to_stream_private_denied(self):
         # type: () -> None
         self.login(self.example_email('hamlet'))
-        user_profile = self.example_user('hamlet')
-        stream = get_stream("Denmark", user_profile.realm)
-        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark")
+        realm = self.example_user('hamlet').realm
+        stream = get_stream("Denmark", realm)
+        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
         do_change_stream_invite_only(stream, True)
 
         bot_info = {
@@ -792,9 +792,9 @@ class BotTest(ZulipTestCase, UploadSerializeMixin):
     def test_patch_bot_events_register_stream_denied(self):
         # type: () -> None
         self.login(self.example_email('hamlet'))
-        user_profile = self.example_user('hamlet')
-        stream = get_stream("Denmark", user_profile.realm)
-        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark")
+        realm = self.example_user('hamlet').realm
+        stream = get_stream("Denmark", realm)
+        self.unsubscribe_from_stream(self.example_email('hamlet'), "Denmark", realm)
         do_change_stream_invite_only(stream, True)
 
         bot_info = {
diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py
index a2db47a7e3..0d967f65ca 100644
--- a/zerver/tests/test_subs.py
+++ b/zerver/tests/test_subs.py
@@ -221,10 +221,11 @@ class StreamAdminTest(ZulipTestCase):
     def test_vacate_private_stream_removes_default_stream(self):
         # type: () -> None
         stream = self.make_stream('new_stream', invite_only=True)
+        realm = self.example_user("hamlet").realm
         self.subscribe_to_stream(self.example_email("hamlet"), stream.name)
         do_add_default_stream(stream)
         self.assertEqual(1, DefaultStream.objects.filter(stream=stream).count())
-        self.unsubscribe_from_stream(self.example_email("hamlet"), stream.name)
+        self.unsubscribe_from_stream(self.example_email("hamlet"), stream.name, realm)
         self.assertEqual(0, DefaultStream.objects.filter(stream=stream).count())
         # Fetch stream again from database.
         stream = Stream.objects.get(id=stream.id)