summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2018-01-09 14:21:03 +0000
committerGitHub <noreply@github.com>2018-01-09 14:21:03 +0000
commita767f06e3f2b2c15a779c1f9df7d358255ebe38c (patch)
treebabd2110f8b0d964f157e14d096273ee37a8abd0 /tests/utils.py
parentMerge pull request #2763 from matrix-org/rav/fix_config_uts (diff)
parentenable twisted delayedcall debugging in UTs (diff)
downloadsynapse-a767f06e3f2b2c15a779c1f9df7d358255ebe38c.tar.xz
Merge pull request #2765 from matrix-org/rav/fix_room_uts
Fix flaky test_rooms UTs
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index ed8a7360f5..44e5f75093 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -58,6 +58,10 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
         config.email_enable_notifs = False
         config.block_non_admin_invites = False
 
+        # disable user directory updates, because they get done in the
+        # background, which upsets the test runner.
+        config.update_user_directory = False
+
     config.use_frozen_dicts = True
     config.database_config = {"name": "sqlite3"}
     config.ldap_enabled = False