Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.

This commit is contained in:
Kegan Dougal 2014-08-14 10:18:54 +01:00
parent 29aa13f0d4
commit 9a1638ed21
12 changed files with 21 additions and 30 deletions

View file

@ -46,7 +46,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"get_room",
"store_room",
]),
http_server=NonCallableMock(),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
notifier=NonCallableMock(spec_set=["on_new_room_event"]),
handlers=NonCallableMock(spec_set=[
@ -317,7 +317,6 @@ class RoomCreationTest(unittest.TestCase):
datastore=NonCallableMock(spec_set=[
"store_room",
]),
http_server=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
notifier=NonCallableMock(spec_set=["on_new_room_event"]),
handlers=NonCallableMock(spec_set=[