summary refs log tree commit diff
path: root/tests/test_state.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-14 16:36:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-14 16:36:01 +0100
commit9a793f861c252e09ec5e15986a2ad01d3586d8ce (patch)
treefa57f00eea83a3ac2e2d48d1f0b6aaf5994e1839 /tests/test_state.py
parentadd a last seen metric (#3396) (diff)
parentMerge tag 'v0.31.2' (diff)
downloadsynapse-9a793f861c252e09ec5e15986a2ad01d3586d8ce.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tests/test_state.py')
-rw-r--r--tests/test_state.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/test_state.py b/tests/test_state.py

index a5c5e55951..71c412faf4 100644 --- a/tests/test_state.py +++ b/tests/test_state.py
@@ -606,6 +606,14 @@ class StateTestCase(unittest.TestCase): } ) + power_levels = create_event( + type=EventTypes.PowerLevels, state_key="", + content={"users": { + "@foo:bar": "100", + "@user_id:example.com": "100", + }} + ) + creation = create_event( type=EventTypes.Create, state_key="", content={"creator": "@foo:bar"} @@ -613,12 +621,14 @@ class StateTestCase(unittest.TestCase): old_state_1 = [ creation, + power_levels, member_event, create_event(type="test1", state_key="1", depth=1), ] old_state_2 = [ creation, + power_levels, member_event, create_event(type="test1", state_key="1", depth=2), ] @@ -633,7 +643,7 @@ class StateTestCase(unittest.TestCase): ) self.assertEqual( - old_state_2[2].event_id, context.current_state_ids[("test1", "1")] + old_state_2[3].event_id, context.current_state_ids[("test1", "1")] ) # Reverse the depth to make sure we are actually using the depths @@ -641,12 +651,14 @@ class StateTestCase(unittest.TestCase): old_state_1 = [ creation, + power_levels, member_event, create_event(type="test1", state_key="1", depth=2), ] old_state_2 = [ creation, + power_levels, member_event, create_event(type="test1", state_key="1", depth=1), ] @@ -659,7 +671,7 @@ class StateTestCase(unittest.TestCase): ) self.assertEqual( - old_state_1[2].event_id, context.current_state_ids[("test1", "1")] + old_state_1[3].event_id, context.current_state_ids[("test1", "1")] ) def _get_context(self, event, prev_event_id_1, old_state_1, prev_event_id_2,