summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-09 12:03:12 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-09 12:06:45 +0000
commit142fb0a7d40f17d834e1e4d13963839195c1040b (patch)
tree1a022367f1acd678264956c177ebcf764930d5cf
parentMerge pull request #2761 from turt2live/patch-1 (diff)
downloadsynapse-142fb0a7d40f17d834e1e4d13963839195c1040b.tar.xz
Disable user_directory updates for UTs
Fix flakiness in the UTs caused by the user_directory being updated in the
background
-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