diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 11:39:40 +0100 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 11:39:40 +0100 |
| commit | cfc28325a67582f6d4cb44d1c4bd123aad5e4e12 (patch) | |
| tree | da83985788b2b53217d34dc32d60d548625f57ad /tests/rest/admin/test_admin.py | |
| parent | add note about database upgrade (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-cfc28325a67582f6d4cb44d1c4bd123aad5e4e12.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
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() |