diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
commit | 91f43dca3939cd6ccbc90d19a284d00f6e14fd7c (patch) | |
tree | cb15ddf14a01a0e67b9eaf91b482d65bf2057f4e /tests/rest/admin/test_admin.py | |
parent | Newsfile (diff) | |
parent | Add domain validation when creating room with list of invitees (#6121) (diff) | |
download | synapse-91f43dca3939cd6ccbc90d19a284d00f6e14fd7c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes
Diffstat (limited to 'tests/rest/admin/test_admin.py')
-rw-r--r-- | tests/rest/admin/test_admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py index 5877bb2133..d3a4f717f7 100644 --- a/tests/rest/admin/test_admin.py +++ b/tests/rest/admin/test_admin.py @@ -62,7 +62,7 @@ class UserRegisterTestCase(unittest.HomeserverTestCase): self.device_handler.check_device_registered = Mock(return_value="FAKE") self.datastore = Mock(return_value=Mock()) - self.datastore.get_current_state_deltas = Mock(return_value=[]) + self.datastore.get_current_state_deltas = Mock(return_value=(0, [])) self.secrets = Mock() |