summary refs log tree commit diff
path: root/tests/storage/test_profile.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-10 16:56:02 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-10 16:56:02 +0100
commit08f5c48fc81753ac29d4f76080a44bcd5aa52ece (patch)
treef2faa955e6d60a9d8c2f3f8016e90da025888dd4 /tests/storage/test_profile.py
parentIt's considered polite to actually wait for DB prepare before running tests (diff)
downloadsynapse-08f5c48fc81753ac29d4f76080a44bcd5aa52ece.tar.xz
Move SQLiteMemoryDbPool implementation into tests.utils
Diffstat (limited to 'tests/storage/test_profile.py')
-rw-r--r--tests/storage/test_profile.py28
1 files changed, 1 insertions, 27 deletions
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 45c69dafae..82e0c33be7 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -18,38 +18,12 @@ from twisted.trial import unittest
 from twisted.internet import defer
 
 from mock import Mock, call
-from twisted.enterprise.adbapi import ConnectionPool
 
 from synapse.server import HomeServer
 from synapse.storage import prepare_database
 from synapse.storage.profile import ProfileStore
 
-
-class SQLiteMemoryDbPool(ConnectionPool, object):
-    def __init__(self):
-        super(SQLiteMemoryDbPool, self).__init__(
-            "sqlite3", ":memory:",
-            cp_min=1,
-            cp_max=1,
-        )
-
-    def prepare(self):
-        return self.runWithConnection(prepare_database)
-
-    #def runInteraction(self, interaction, *args, **kwargs):
-    #    # Just use a cursor as the txn directly
-    #    txn = self.db.cursor()
-
-    #    def _on_success(result):
-    #        txn.commit()
-    #        return result
-    #    def _on_failure(failure):
-    #        txn.rollback()
-    #        raise failure
-
-    #    d = interaction(txn, *args, **kwargs)
-    #    d.addCallbacks(_on_success, _on_failure)
-    #    return d
+from tests.utils import SQLiteMemoryDbPool
 
 
 class ProfileStoreTestCase(unittest.TestCase):