summary refs log tree commit diff
path: root/tests/crypto
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-25 23:14:24 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-27 17:15:15 +0000
commitd7eacc4f87ca8353f612171fa7e070c14e3b35ee (patch)
treee9f15461058daf837df687a89f39aa16db41f2e9 /tests/crypto
parentRun on_new_connection for unit tests (diff)
downloadsynapse-d7eacc4f87ca8353f612171fa7e070c14e3b35ee.tar.xz
Create dbpool as normal in tests
... instead of creating our own special SQLiteMemoryDbPool, whose purpose was a
bit of a mystery.

For some reason this makes one of the tests run slightly slower, so bump the
sleep(). Sorry.
Diffstat (limited to 'tests/crypto')
-rw-r--r--tests/crypto/test_keyring.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/crypto/test_keyring.py b/tests/crypto/test_keyring.py
index c899fecf5d..d4ec02ffc2 100644
--- a/tests/crypto/test_keyring.py
+++ b/tests/crypto/test_keyring.py
@@ -167,7 +167,7 @@ class KeyringTestCase(unittest.TestCase):
 
             # wait a tick for it to send the request to the perspectives server
             # (it first tries the datastore)
-            yield async.sleep(0.005)
+            yield async.sleep(1)   # XXX find out why this takes so long!
             self.http_client.post_json.assert_called_once()
 
             self.assertIs(LoggingContext.current_context(), context_11)
@@ -183,7 +183,7 @@ class KeyringTestCase(unittest.TestCase):
                 res_deferreds_2 = kr.verify_json_objects_for_server(
                     [("server10", json1)],
                 )
-                yield async.sleep(0.005)
+                yield async.sleep(01)
                 self.http_client.post_json.assert_not_called()
                 res_deferreds_2[0].addBoth(self.check_context, None)