diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
| commit | 9970f955ce1ab36d21f7824d9f1382ab1df778e5 (patch) | |
| tree | 94f824e633ac9b9fab18171a67a6b94aec2839a9 /tests/rest | |
| parent | Newsfile (diff) | |
| parent | Fix races in room stats (and other) updates. (#6187) (diff) | |
| download | synapse-9970f955ce1ab36d21f7824d9f1382ab1df778e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'tests/rest')
| -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() |