tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536)

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-10-30 15:26:56 -04:00
parent 77e1fe1915
commit 1b5b407619
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/cli_test.py
View File

@ -215,17 +215,17 @@ class CLITestCase(DockerClientTestCase):
networks = client.networks(names=[self.project.name]) networks = client.networks(names=[self.project.name])
for n in networks: for n in networks:
self.addCleanup(client.remove_network, n['id']) self.addCleanup(client.remove_network, n['Id'])
self.assertEqual(len(networks), 1) self.assertEqual(len(networks), 1)
self.assertEqual(networks[0]['driver'], 'bridge') self.assertEqual(networks[0]['Driver'], 'bridge')
network = client.inspect_network(networks[0]['id']) network = client.inspect_network(networks[0]['Id'])
self.assertEqual(len(network['containers']), len(services)) self.assertEqual(len(network['Containers']), len(services))
for service in services: for service in services:
containers = service.containers() containers = service.containers()
self.assertEqual(len(containers), 1) self.assertEqual(len(containers), 1)
self.assertIn(containers[0].id, network['containers']) self.assertIn(containers[0].id, network['Containers'])
self.assertEqual(containers[0].get('Config.Hostname'), service.name) self.assertEqual(containers[0].get('Config.Hostname'), service.name)
web_container = self.project.get_service('web').containers()[0] web_container = self.project.get_service('web').containers()[0]
@ -518,7 +518,7 @@ class CLITestCase(DockerClientTestCase):
container, = service.containers(stopped=True, one_off=True) container, = service.containers(stopped=True, one_off=True)
networks = client.networks(names=[self.project.name]) networks = client.networks(names=[self.project.name])
for n in networks: for n in networks:
self.addCleanup(client.remove_network, n['id']) self.addCleanup(client.remove_network, n['Id'])
self.assertEqual(len(networks), 1) self.assertEqual(len(networks), 1)
self.assertEqual(container.human_readable_command, u'true') self.assertEqual(container.human_readable_command, u'true')

2
tests/integration/project_test.py
View File

@ -111,7 +111,7 @@ class ProjectTest(DockerClientTestCase):
network_name = 'network_does_exist' network_name = 'network_does_exist'
project = Project(network_name, [], client) project = Project(network_name, [], client)
client.create_network(network_name) client.create_network(network_name)
assert project.get_network()['name'] == network_name assert project.get_network()['Name'] == network_name
def test_net_from_service(self): def test_net_from_service(self):
project = Project.from_dicts( project = Project.from_dicts(