diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
| commit | 2af40cfa14ba579c156349ae3457a55bc93f8548 (patch) | |
| tree | 2b94b53c72d51fc170549213ed8cb88556c2b501 /tests/rest | |
| parent | Add a script for talking matrix federation adding X-Matrix Authorization (diff) | |
| parent | Fix pyflakes (diff) | |
| download | synapse-2af40cfa14ba579c156349ae3457a55bc93f8548.tar.xz | |
Merge pull request #25 from matrix-org/events_refactor
Event refactor
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/test_events.py | 4 | ||||
| -rw-r--r-- | tests/rest/test_rooms.py | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py index 4a3234c332..d3159e2cf4 100644 --- a/tests/rest/test_events.py +++ b/tests/rest/test_events.py @@ -113,9 +113,6 @@ class EventStreamPermissionsTestCase(RestTestCase): def setUp(self): self.mock_resource = MockHttpResource(prefix=PATH_PREFIX) - persistence_service = Mock(spec=["get_latest_pdus_in_context"]) - persistence_service.get_latest_pdus_in_context.return_value = [] - self.mock_config = NonCallableMock() self.mock_config.signing_key = [MockKey()] @@ -127,7 +124,6 @@ class EventStreamPermissionsTestCase(RestTestCase): db_pool=db_pool, http_client=None, replication_layer=Mock(), - persistence_service=persistence_service, clock=Mock(spec=[ "call_later", "cancel_call_later", diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py index 1f719beb0a..84fd730afc 100644 --- a/tests/rest/test_rooms.py +++ b/tests/rest/test_rooms.py @@ -503,7 +503,7 @@ class RoomsMemberListTestCase(RestTestCase): @defer.inlineCallbacks def test_get_member_list_mixed_memberships(self): - room_creator = "@some_other_guy:blue" + room_creator = "@some_other_guy:red" room_id = yield self.create_room_as(room_creator) room_path = "/rooms/%s/members" % room_id yield self.invite(room=room_id, src=room_creator, |