diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-03-30 13:59:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 13:59:07 +0100 |
| commit | 6486c96b6549fe4c8e4c9a207d767004614b5302 (patch) | |
| tree | 98346ace7a246634551a9857d30039de091f236d /tests/rest | |
| parent | Add developer documentation for running a local CAS server (#7147) (diff) | |
| parent | Add tests for outbound device pokes (diff) | |
| download | synapse-6486c96b6549fe4c8e4c9a207d767004614b5302.tar.xz | |
Merge pull request #7157 from matrix-org/rev.outbound_device_pokes_tests
Add tests for outbound device pokes
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/v2_alpha/test_register.py | 4 | ||||
| -rw-r--r-- | tests/rest/key/v2/test_remote_key_resource.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index d0c997e385..b6ed06e02d 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -36,8 +36,8 @@ class RegisterRestServletTestCase(unittest.HomeserverTestCase): servlets = [register.register_servlets] url = b"/_matrix/client/r0/register" - def default_config(self, name="test"): - config = super().default_config(name) + def default_config(self): + config = super().default_config() config["allow_guest_access"] = True return config diff --git a/tests/rest/key/v2/test_remote_key_resource.py b/tests/rest/key/v2/test_remote_key_resource.py index 6776a56cad..99eb477149 100644 --- a/tests/rest/key/v2/test_remote_key_resource.py +++ b/tests/rest/key/v2/test_remote_key_resource.py @@ -143,8 +143,8 @@ class EndToEndPerspectivesTests(BaseRemoteKeyResourceTestCase): endpoint, to check that the two implementations are compatible. """ - def default_config(self, *args, **kwargs): - config = super().default_config(*args, **kwargs) + def default_config(self): + config = super().default_config() # replace the signing key with our own self.hs_signing_key = signedjson.key.generate_signing_key("kssk") |