diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-01-20 12:33:05 +0000 |
| commit | 6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch) | |
| tree | c0e82ece8dd47bdd3d0d142953d8b494c0b40023 /tests | |
| parent | Reword confusing sentence in CHANGES. (diff) | |
| parent | Give `public_baseurl` a default value (#9159) (diff) | |
| download | synapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz | |
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/test_well_known.py | 9 | ||||
| -rw-r--r-- | tests/utils.py | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/rest/test_well_known.py b/tests/rest/test_well_known.py index 14de0921be..c5e44af9f7 100644 --- a/tests/rest/test_well_known.py +++ b/tests/rest/test_well_known.py @@ -40,12 +40,3 @@ class WellKnownTests(unittest.HomeserverTestCase): "m.identity_server": {"base_url": "https://testis"}, }, ) - - def test_well_known_no_public_baseurl(self): - self.hs.config.public_baseurl = None - - channel = self.make_request( - "GET", "/.well-known/matrix/client", shorthand=False - ) - - self.assertEqual(channel.code, 404) diff --git a/tests/utils.py b/tests/utils.py index 977eeaf6ee..09614093bc 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -159,7 +159,6 @@ def default_config(name, parse=False): "remote": {"per_second": 10000, "burst_count": 10000}, }, "saml2_enabled": False, - "public_baseurl": None, "default_identity_server": None, "key_refresh_interval": 24 * 60 * 60 * 1000, "old_signing_keys": {}, |