diff options
| author | reivilibre <oliverw@matrix.org> | 2023-05-26 14:28:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 14:28:55 +0000 |
| commit | c775d80b73b7930b9541e353fc24dcef66579e48 (patch) | |
| tree | d7a2460c1857ee9583cb8ac4aed4591b6ff8bbd1 /tests/app | |
| parent | Add `dch` and `notify-send` to the development Nix flake so that the release ... (diff) | |
| download | synapse-c775d80b73b7930b9541e353fc24dcef66579e48.tar.xz | |
Fix a bug introduced in Synapse v1.84.0 where workers do not start up when no `instance_map` was provided. (#15672)
* Fix #15669: always populate instance map even if it was empty * Fix some tests * Fix more tests * Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org> * CI fix: don't forget to update apt repository sources before installing olddeps deps * Add test testing the backwards compatibility --------- Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
Diffstat (limited to 'tests/app')
| -rw-r--r-- | tests/app/test_homeserver_start.py | 2 | ||||
| -rw-r--r-- | tests/app/test_openid_listener.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/app/test_homeserver_start.py b/tests/app/test_homeserver_start.py index 788c935537..cd117b7394 100644 --- a/tests/app/test_homeserver_start.py +++ b/tests/app/test_homeserver_start.py @@ -25,6 +25,8 @@ class HomeserverAppStartTestCase(ConfigFileTestCase): # Add a blank line as otherwise the next addition ends up on a line with a comment self.add_lines_to_config([" "]) self.add_lines_to_config(["worker_app: test_worker_app"]) + self.add_lines_to_config(["worker_replication_host: 127.0.0.1"]) + self.add_lines_to_config(["worker_replication_http_port: 0"]) # Ensure that starting master process with worker config raises an exception with self.assertRaises(ConfigError): diff --git a/tests/app/test_openid_listener.py b/tests/app/test_openid_listener.py index 2ee343d8a4..056d9402a4 100644 --- a/tests/app/test_openid_listener.py +++ b/tests/app/test_openid_listener.py @@ -42,6 +42,7 @@ class FederationReaderOpenIDListenerTests(HomeserverTestCase): # have to tell the FederationHandler not to try to access stuff that is only # in the primary store. conf["worker_app"] = "yes" + conf["instance_map"] = {"main": {"host": "127.0.0.1", "port": 0}} return conf |