summarylogtreecommitdiffstats
path: root/matrix-synapse-fix-worker-test-race.patch
blob: 2b1300933f61a87836f5b84524c22a857710c58f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
diff --git i/tests/server.py w/tests/server.py
index 30337f3e38..af15160c78 100644
--- i/tests/server.py
+++ w/tests/server.py
@@ -1157,9 +1157,17 @@ def setup_test_homeserver(
 
             database = DatabaseConnectionConfig("master", database_config)
             config.database.databases = [database]
-            prepare_database(
-                PREPPED_SQLITE_DB_CONN, create_engine(database_config), config
-            )
+            # Temporarily clear worker_app for template preparation, as the
+            # template is shared across all tests (including worker tests).
+            # Workers cannot initialize an empty database.
+            original_worker_app = config.worker.worker_app
+            config.worker.worker_app = None
+            try:
+                prepare_database(
+                    PREPPED_SQLITE_DB_CONN, create_engine(database_config), config
+                )
+            finally:
+                config.worker.worker_app = original_worker_app
 
         database_config["_TEST_PREPPED_CONN"] = PREPPED_SQLITE_DB_CONN