diff options
| author | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2023-05-26 17:16:15 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <oliverw@matrix.org> | 2023-05-26 17:16:15 +0100 |
| commit | a1154dfc20102e7a0d937cd6afff1fceba0456cf (patch) | |
| tree | dbcba4fa9388945bc3bd1931df51862fd9d534e3 /tests/app | |
| parent | Add MSC3820 (room version 11) option 2 unstable room version. (#15666) (diff) | |
| parent | Fix a typographical error in changelog (diff) | |
| download | synapse-a1154dfc20102e7a0d937cd6afff1fceba0456cf.tar.xz | |
Merge branch 'master' into develop
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 6e0413400e..5a965f233b 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 |