diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-04-01 10:24:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 10:24:38 +0100 |
| commit | 54a87a7b086048e2131a6d1ed00e25836ffa2995 (patch) | |
| tree | 64e076d41b9b4bee5b4f61cd00d0a06917b9b68d /tests/state | |
| parent | Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.md (diff) | |
| download | synapse-54a87a7b086048e2131a6d1ed00e25836ffa2995.tar.xz | |
Collect room-version variations into one place (#4969)
Collect all the things that make room-versions different to one another into one place, so that it's easier to define new room versions.
Diffstat (limited to 'tests/state')
| -rw-r--r-- | tests/state/test_v2.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/state/test_v2.py b/tests/state/test_v2.py index 9a5c816927..f448b01326 100644 --- a/tests/state/test_v2.py +++ b/tests/state/test_v2.py @@ -19,7 +19,8 @@ from six.moves import zip import attr -from synapse.api.constants import EventTypes, JoinRules, Membership, RoomVersions +from synapse.api.constants import EventTypes, JoinRules, Membership +from synapse.api.room_versions import 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,7 +540,7 @@ class StateTestCase(unittest.TestCase): state_before = dict(state_at_event[prev_events[0]]) else: state_d = resolve_events_with_store( - RoomVersions.V2, + RoomVersions.V2.identifier, [state_at_event[n] for n in prev_events], event_map=event_map, state_res_store=TestStateResolutionStore(event_map), @@ -686,7 +687,7 @@ class SimpleParamStateTestCase(unittest.TestCase): # Test that we correctly handle passing `None` as the event_map state_d = resolve_events_with_store( - RoomVersions.V2, + RoomVersions.V2.identifier, [self.state_at_bob, self.state_at_charlie], event_map=None, state_res_store=TestStateResolutionStore(self.event_map), |