summary refs log tree commit diff
path: root/tests/storage/test_redaction.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-02-11 11:46:08 +0000
committerMark Haines <mjark@negativecurvature.net>2015-02-11 11:46:08 +0000
commitf42e29cf956c00be618fa4601441d62848c1270c (patch)
treedf5ce8afb4c2972408c758e0ace795046ba170a6 /tests/storage/test_redaction.py
parentFix bug where variable was not always defined (diff)
parentFactor out some of the common homeserver setup code into a (diff)
downloadsynapse-f42e29cf956c00be618fa4601441d62848c1270c.tar.xz
Merge pull request #63 from matrix-org/homeserver_test_setup
Factor out some of the common homeserver setup code
Diffstat (limited to 'tests/storage/test_redaction.py')
-rw-r--r--tests/storage/test_redaction.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py
index 0713dfab64..b57006fcb4 100644
--- a/tests/storage/test_redaction.py
+++ b/tests/storage/test_redaction.py
@@ -17,11 +17,10 @@
 from tests import unittest
 from twisted.internet import defer
 
-from synapse.server import HomeServer
 from synapse.api.constants import EventTypes, Membership
 from synapse.types import UserID, RoomID
 
-from tests.utils import SQLiteMemoryDbPool, MockKey
+from tests.utils import setup_test_homeserver
 
 from mock import Mock
 
@@ -30,16 +29,7 @@ class RedactionTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def setUp(self):
-        db_pool = SQLiteMemoryDbPool()
-        yield db_pool.prepare()
-
-        self.mock_config = Mock()
-        self.mock_config.signing_key = [MockKey()]
-
-        hs = HomeServer(
-            "test",
-            db_pool=db_pool,
-            config=self.mock_config,
+        hs = yield setup_test_homeserver(
             resource_for_federation=Mock(),
             http_client=None,
         )