From d79e90f078c83314de3dc469770750dd2585e255 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Dec 2015 17:56:56 +0000
Subject: [PATCH] Add mocks to make tests work again

---
 tests/handlers/test_federation.py | 7 +++++++
 tests/handlers/test_room.py       | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index d392c2301..a4758c03d 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -49,6 +49,10 @@ class FederationTestCase(unittest.TestCase):
                 "get_destination_retry_timings",
                 "set_destination_retry_timings",
                 "have_events",
+                "get_users_in_room",
+                "bulk_get_push_rules",
+                "get_current_state",
+                "set_actions_for_event_and_users",
             ]),
             resource_for_federation=NonCallableMock(),
             http_client=NonCallableMock(spec_set=[]),
@@ -85,6 +89,9 @@ class FederationTestCase(unittest.TestCase):
 
         self.datastore.persist_event.return_value = defer.succeed((1,1))
         self.datastore.get_room.return_value = defer.succeed(True)
+        self.datastore.get_users_in_room.return_value = ["@a:b"]
+        self.datastore.bulk_get_push_rules.return_value = {}
+        self.datastore.get_current_state.return_value = {}
         self.auth.check_host_in_room.return_value = defer.succeed(True)
 
         retry_timings_res = {
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 2a7553f98..ba20b3194 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -43,6 +43,10 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
                 "store_room",
                 "get_latest_events_in_room",
                 "add_event_hashes",
+                "get_users_in_room",
+                "bulk_get_push_rules",
+                "get_current_state",
+                "set_actions_for_event_and_users",
             ]),
             resource_for_federation=NonCallableMock(),
             http_client=NonCallableMock(spec_set=[]),
@@ -90,6 +94,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
 
         self.datastore.persist_event.return_value = (1,1)
         self.datastore.add_event_hashes.return_value = []
+        self.datastore.get_users_in_room.return_value = ["@bob:red"]
+        self.datastore.bulk_get_push_rules.return_value = {}
 
     @defer.inlineCallbacks
     def test_invite(self):
@@ -109,6 +115,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         self.datastore.get_latest_events_in_room.return_value = (
             defer.succeed([])
         )
+        self.datastore.get_current_state.return_value = {}
 
         def annotate(_):
             ctx = Mock()
@@ -190,6 +197,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         self.datastore.get_latest_events_in_room.return_value = (
             defer.succeed([])
         )
+        self.datastore.get_current_state.return_value = {}
 
         def annotate(_):
             ctx = Mock()
@@ -265,6 +273,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         self.datastore.get_latest_events_in_room.return_value = (
             defer.succeed([])
         )
+        self.datastore.get_current_state.return_value = {}
 
         def annotate(_):
             ctx = Mock()