diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2019-01-11 15:50:28 +0000 |
|---|---|---|
| committer | Michael Kaye <1917473+michaelkaye@users.noreply.github.com> | 2019-01-11 15:50:28 +0000 |
| commit | cf68593544df2f14e1d389285c53cf0050353280 (patch) | |
| tree | 62264c36b672f0a7f4360606040ea77d953bc4a1 /tests | |
| parent | Merge pull request #4148 from matrix-org/matthew/red_list (diff) | |
| download | synapse-dinsic_2019-01-11.tar.xz | |
Synchronise account metadata onto another server. (#4145) dinsic_2019-01-11
* implement shadow registration via AS (untested) * shadow support for 3pid binding/unbinding (untested)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_mau.py | 1 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_mau.py b/tests/test_mau.py index 59d50e54e1..bdbacb8448 100644 --- a/tests/test_mau.py +++ b/tests/test_mau.py @@ -63,7 +63,6 @@ class TestMauLimit(unittest.TestCase): self.hs.config.server_notices_mxid_display_name = None self.hs.config.server_notices_mxid_avatar_url = None self.hs.config.server_notices_room_name = "Test Server Notice Room" - self.hs.config.register_mxid_from_3pid = None self.resource = JsonResource(self.hs) register.register_servlets(self.hs, self.resource) diff --git a/tests/utils.py b/tests/utils.py index 022a868501..5ddf633f56 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -137,6 +137,8 @@ def default_config(name): config.admin_contact = None config.rc_messages_per_second = 10000 config.rc_message_burst_count = 10000 + config.register_mxid_from_3pid = None + config.shadow_server = None config.use_frozen_dicts = False |