summary refs log tree commit diff
path: root/tests/state/test_v2.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-28 20:09:38 +0000
committerGitHub <noreply@github.com>2019-01-28 20:09:38 +0000
commitf1a04462ebfde48cbd42c42f05d67710a7f5955c (patch)
tree3bfb7acd4b72f69bc27299e19e37a133bea6bb63 /tests/state/test_v2.py
parentFix worker TLS (#4492) (diff)
parentCorrectly use default room version if none is set (diff)
downloadsynapse-f1a04462ebfde48cbd42c42f05d67710a7f5955c.tar.xz
Merge pull request #4482 from matrix-org/erikj/event_auth_room_version
Pass through room version to event auth
Diffstat (limited to 'tests/state/test_v2.py')
-rw-r--r--tests/state/test_v2.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/state/test_v2.py b/tests/state/test_v2.py
index 2e073a3afc..9a5c816927 100644
--- a/tests/state/test_v2.py
+++ b/tests/state/test_v2.py
@@ -19,7 +19,7 @@ from six.moves import zip
 
 import attr
 
-from synapse.api.constants import EventTypes, JoinRules, Membership
+from synapse.api.constants import EventTypes, JoinRules, Membership, RoomVersions
 from synapse.event_auth import auth_types_for_event
 from synapse.events import FrozenEvent
 from synapse.state.v2 import lexicographical_topological_sort, resolve_events_with_store
@@ -539,6 +539,7 @@ class StateTestCase(unittest.TestCase):
                 state_before = dict(state_at_event[prev_events[0]])
             else:
                 state_d = resolve_events_with_store(
+                    RoomVersions.V2,
                     [state_at_event[n] for n in prev_events],
                     event_map=event_map,
                     state_res_store=TestStateResolutionStore(event_map),
@@ -685,6 +686,7 @@ class SimpleParamStateTestCase(unittest.TestCase):
         # Test that we correctly handle passing `None` as the event_map
 
         state_d = resolve_events_with_store(
+            RoomVersions.V2,
             [self.state_at_bob, self.state_at_charlie],
             event_map=None,
             state_res_store=TestStateResolutionStore(self.event_map),