mirror of
https://github.com/docker/compose.git
synced 2025-07-25 22:54:54 +02:00
Merge pull request #2298 from dnephin/update_networking_test_for_rc4
Fix networking tests to work with new API in engine rc4
This commit is contained in:
commit
3738da09e2
@ -8,7 +8,7 @@ VENV=/code/.tox/py27
|
|||||||
mkdir -p `pwd`/dist
|
mkdir -p `pwd`/dist
|
||||||
chmod 777 `pwd`/dist
|
chmod 777 `pwd`/dist
|
||||||
|
|
||||||
$VENV/bin/pip install -r requirements-build.txt
|
$VENV/bin/pip install -q -r requirements-build.txt
|
||||||
su -c "$VENV/bin/pyinstaller docker-compose.spec" user
|
su -c "$VENV/bin/pyinstaller docker-compose.spec" user
|
||||||
mv dist/docker-compose $TARGET
|
mv dist/docker-compose $TARGET
|
||||||
$TARGET version
|
$TARGET version
|
||||||
|
@ -31,7 +31,7 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
|
|
||||||
function on_exit() {
|
function on_exit() {
|
||||||
if [[ "$?" != "0" ]]; then
|
if [[ "$?" != "0" ]]; then
|
||||||
docker logs "$daemon_container"
|
docker logs "$daemon_container" 2>&1 | tail -n 100
|
||||||
fi
|
fi
|
||||||
docker rm -vf "$daemon_container"
|
docker rm -vf "$daemon_container"
|
||||||
}
|
}
|
||||||
@ -45,6 +45,7 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
--volume="/var/lib/docker" \
|
--volume="/var/lib/docker" \
|
||||||
dockerswarm/dind:$version \
|
dockerswarm/dind:$version \
|
||||||
docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
||||||
|
2>&1 | tail -n 10
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
--rm \
|
--rm \
|
||||||
|
@ -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')
|
||||||
|
|
||||||
|
@ -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(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user