summary refs log tree commit diff
path: root/tests/test_state.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
commitfaf72a4c403000f7815d171feb8bf1a83b353584 (patch)
treed150b317ef4d0cf2245b664a37e51d76c0870352 /tests/test_state.py
parentMerge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff)
parentRemove bind_email and bind_msisdn (#5964) (diff)
downloadsynapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'tests/test_state.py')
-rw-r--r--tests/test_state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_state.py b/tests/test_state.py

index 6d33566f47..610ec9fb46 100644 --- a/tests/test_state.py +++ b/tests/test_state.py
@@ -106,7 +106,7 @@ class StateGroupStore(object): } def get_state_group_delta(self, name): - return (None, None) + return None, None def register_events(self, events): for e in events: