diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-30 13:37:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-30 13:37:04 +0000 |
| commit | ec6de1cc7d915abf6907b1d6a93336f8cd435cdd (patch) | |
| tree | 5e0beaa14d2e9abc82116a7a07740abf2508177b /tests/handlers | |
| parent | Review comments (diff) | |
| parent | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor (diff) | |
| download | synapse-ec6de1cc7d915abf6907b1d6a93336f8cd435cdd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_persistence_store
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_stats.py | 2 | ||||
| -rw-r--r-- | tests/handlers/test_typing.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/handlers/test_stats.py b/tests/handlers/test_stats.py index d5c8bd7612..e0075ccd32 100644 --- a/tests/handlers/test_stats.py +++ b/tests/handlers/test_stats.py @@ -607,6 +607,7 @@ class StatsRoomTests(unittest.HomeserverTestCase): """ self.hs.config.stats_enabled = False + self.handler.stats_enabled = False u1 = self.register_user("u1", "pass") u1token = self.login("u1", "pass") @@ -618,6 +619,7 @@ class StatsRoomTests(unittest.HomeserverTestCase): self.assertIsNone(self._get_current_stats("user", u1)) self.hs.config.stats_enabled = True + self.handler.stats_enabled = True self._perform_background_initial_update() diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 67f1013051..f360c8e965 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -144,6 +144,9 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase): self.datastore.get_to_device_stream_token = lambda: 0 self.datastore.get_new_device_msgs_for_remote = lambda *args, **kargs: ([], 0) self.datastore.delete_device_msgs_for_remote = lambda *args, **kargs: None + self.datastore.set_received_txn_response = lambda *args, **kwargs: defer.succeed( + None + ) def test_started_typing_local(self): self.room_members = [U_APPLE, U_BANANA] |