summary refs log tree commit diff
path: root/tests/storage/test_room.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-08-14 20:56:23 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-08-14 20:56:23 +1000
commit591bf87c6afcdb4e8978a275219dd10dba4efc25 (patch)
treea2620b679bcaa6ecf75388be0ed5e17fa350d2cd /tests/storage/test_room.py
parentFixes test_reap_monthly_active_users so it passes under postgres (diff)
parentImplement a new test baseclass to cut down on boilerplate (#3684) (diff)
downloadsynapse-591bf87c6afcdb4e8978a275219dd10dba4efc25.tar.xz
Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres
Diffstat (limited to 'tests/storage/test_room.py')
-rw-r--r--tests/storage/test_room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index 84d49b55c1..a1ea23b068 100644
--- a/tests/storage/test_room.py
+++ b/tests/storage/test_room.py
@@ -26,7 +26,7 @@ from tests.utils import setup_test_homeserver
 class RoomStoreTestCase(unittest.TestCase):
     @defer.inlineCallbacks
     def setUp(self):
-        hs = yield setup_test_homeserver()
+        hs = yield setup_test_homeserver(self.addCleanup)
 
         # We can't test RoomStore on its own without the DirectoryStore, for
         # management of the 'room_aliases' table
@@ -57,7 +57,7 @@ class RoomStoreTestCase(unittest.TestCase):
 class RoomEventsStoreTestCase(unittest.TestCase):
     @defer.inlineCallbacks
     def setUp(self):
-        hs = setup_test_homeserver()
+        hs = setup_test_homeserver(self.addCleanup)
 
         # Room events need the full datastore, for persist_event() and
         # get_room_state()