summary refs log tree commit diff
path: root/tests/storage/test_directory.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-11 15:21:15 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-11 15:21:15 +0100
commit493b1e6d3ccb9fd806e6d4c22daa1b6657c6ae7f (patch)
treeff07d3afd58acf767ef8208538fbb944f96f9263 /tests/storage/test_directory.py
parentStart of converting PresenceHandler unit tests to use SQLiteMemoryDbPool - ju... (diff)
downloadsynapse-493b1e6d3ccb9fd806e6d4c22daa1b6657c6ae7f.tar.xz
Need to prepare() the SQLiteMemoryDbPool before passing it to HomeServer constructor, as DataStore's constructor will want it ready
Diffstat (limited to 'tests/storage/test_directory.py')
-rw-r--r--tests/storage/test_directory.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 49c41700f6..c4c321dda6 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -27,12 +27,13 @@ class DirectoryStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
+        db_pool = SQLiteMemoryDbPool()
+        yield db_pool.prepare()
+
         hs = HomeServer("test",
-            db_pool=SQLiteMemoryDbPool(),
+            db_pool=db_pool,
         )
 
-        yield hs.get_db_pool().prepare()
-
         self.store = DirectoryStore(hs)
 
         self.room = hs.parse_roomid("!abcde:test")