summary refs log tree commit diff
path: root/tests/utils.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/utils.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/utils.py')
-rw-r--r--tests/utils.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index d90214e418..bc5d35e56b 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -16,12 +16,14 @@ from synapse.http.server import HttpServer from synapse.api.errors import cs_error, CodeMessageException, StoreError from synapse.api.constants import Membership +from synapse.storage import prepare_database from synapse.api.events.room import ( RoomMemberEvent, MessageEvent ) from twisted.internet import defer, reactor +from twisted.enterprise.adbapi import ConnectionPool from collections import namedtuple from mock import patch, Mock @@ -120,6 +122,18 @@ class MockClock(object): self.now += secs +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) + + class MemoryDataStore(object): Room = namedtuple(