summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 17:43:22 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 17:43:22 +0100
commitb586b8b986fbeeb71eb864bd12b19c4b226535ab (patch)
tree269fe2cf7d8df454df32633ec025fbdb95a164d4 /tests
parentfix off by 1 errors (diff)
parentMerge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff)
downloadsynapse-b586b8b986fbeeb71eb864bd12b19c4b226535ab.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_sync.py2
-rw-r--r--tests/storage/test_monthly_active_users.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_sync.py b/tests/handlers/test_sync.py
index cfd37f3138..8c8b65e04e 100644
--- a/tests/handlers/test_sync.py
+++ b/tests/handlers/test_sync.py
@@ -29,7 +29,7 @@ class SyncTestCase(tests.unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
-        self.hs = yield setup_test_homeserver()
+        self.hs = yield setup_test_homeserver(self.addCleanup)
         self.sync_handler = SyncHandler(self.hs)
         self.store = self.hs.get_datastore()
 
diff --git a/tests/storage/test_monthly_active_users.py b/tests/storage/test_monthly_active_users.py
index 0d58dcebc5..511acbde9b 100644
--- a/tests/storage/test_monthly_active_users.py
+++ b/tests/storage/test_monthly_active_users.py
@@ -33,7 +33,7 @@ class MonthlyActiveUsersTestCase(tests.unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_initialise_reserved_users(self):
-
+        self.hs.config.max_mau_value = 5
         user1 = "@user1:server"
         user1_email = "user1@matrix.org"
         user2 = "@user2:server"