summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2023-08-22 07:46:32 -0400
committerGitHub <noreply@github.com>2023-08-22 07:46:32 -0400
commit6d7c63fcc6e4e8f5bb24f471c5308d4cf4acafab (patch)
tree4642bcff3907888513528e84e81ab4f4337f49ee
parentDisallow user_consent where experimental MSC3861 is enabled (#16127) (diff)
downloadsynapse-6d7c63fcc6e4e8f5bb24f471c5308d4cf4acafab.tar.xz
Properly call setup_background_tasks in unit tests. (#16150)
This should only be called on HomeServer objects which are configured
to run background tasks, which is automatically (and properly) done via
the call to setup().
-rw-r--r--changelog.d/16150.misc1
-rw-r--r--tests/server.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog.d/16150.misc b/changelog.d/16150.misc
new file mode 100644
index 0000000000..97861282fd
--- /dev/null
+++ b/changelog.d/16150.misc
@@ -0,0 +1 @@
+Clean-up calling `setup_background_tasks` in unit tests.
diff --git a/tests/server.py b/tests/server.py
index 481fe34c5c..ff03d28864 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -1000,8 +1000,6 @@ def setup_test_homeserver(
     hs.tls_server_context_factory = Mock()
 
     hs.setup()
-    if homeserver_to_use == TestHomeServer:
-        hs.setup_background_tasks()
 
     if isinstance(db_engine, PostgresEngine):
         database_pool = hs.get_datastores().databases[0]