summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-12-03 11:40:05 +0000
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-12-03 11:40:05 +0000
commit7be88fbf48156b36b6daefb228e1258e7d48cae4 (patch)
tree410bc40185bfb528e786392c5677d6e708d521ba /tests
parentMove `tests.utils.setup_test_homeserver` to `tests.server` (diff)
downloadsynapse-7be88fbf48156b36b6daefb228e1258e7d48cae4.tar.xz
Give `tests.server.setup_test_homeserver` (nominally!) the same behaviour
by calling into `make_test_homeserver_synchronous`.

The function *could* have been inlined at this point but the function is big enough

and it felt fine to leave it as is.

At least there isn't a confusing name clash anymore!
Diffstat (limited to 'tests')
-rw-r--r--tests/server.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/server.py b/tests/server.py
index 017e5cf635..b29df37595 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -850,4 +850,7 @@ def setup_test_homeserver(
 
     hs.get_auth_handler().validate_hash = validate_hash
 
+    # Make the threadpool and database transactions synchronous for testing.
+    make_test_homeserver_synchronous(hs)
+
     return hs