diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-15 14:45:59 +0000 |
| commit | 57e0e619f3ddc68673a0d7b345203b1a52ff1fa1 (patch) | |
| tree | d7c45715bc9313f7602243b1cd614d95d1a24858 /tests/rest/test_rooms.py | |
| parent | Add beginnings of upgrade script (diff) | |
| parent | Still send typing notifications to myself if I'm the only one in the room (it... (diff) | |
| download | synapse-57e0e619f3ddc68673a0d7b345203b1a52ff1fa1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts: tests/handlers/test_room.py
Diffstat (limited to 'tests/rest/test_rooms.py')
| -rw-r--r-- | tests/rest/test_rooms.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/rest/test_rooms.py b/tests/rest/test_rooms.py index e2172366ef..84fd730afc 100644 --- a/tests/rest/test_rooms.py +++ b/tests/rest/test_rooms.py @@ -1066,7 +1066,3 @@ class RoomInitialSyncTestCase(RestTestCase): } self.assertTrue(self.user_id in presence_by_user) self.assertEquals("m.presence", presence_by_user[self.user_id]["type"]) - -# (code, response) = yield self.mock_resource.trigger("GET", path, None) -# self.assertEquals(200, code, msg=str(response)) -# self.assert_dict(json.loads(content), response) |