diff options
| author | Joffrey F <joffrey@docker.com> | 2015-10-28 18:07:28 +0100 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-10-28 18:07:28 +0100 |
| commit | 1204a40c5448ed469e2294f771f9a94a4061fcbc (patch) | |
| tree | 4180603200597e03bb1f7a82653177937d0e7596 | |
| parent | aaeb6c1087652b73ba46a2b4296060356bbd957f (diff) | |
| download | docker-py-fix_tests_docker_17393.tar.gz | |
Fix test issues brought on by changes in inspect resultsfix_tests_docker_17393
docker/docker#17393 changes the network settings struct
a bit, which impacts tests checking values in inspect results
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | tests/integration/container_test.py | 12 | ||||
| -rw-r--r-- | tests/integration/network_test.py | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py index a70c0ad..e11644d 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -263,8 +263,16 @@ class CreateContainerTest(api_test.BaseTestCase): self.client.start(container) res = self.client.inspect_container(container['Id']) - self.assertEqual(mac_address_expected, - res['NetworkSettings']['MacAddress']) + try: + self.assertEqual( + mac_address_expected, + res['NetworkSettings']['Networks']['bridge']['MacAddress'] + ) + except KeyError: + self.assertEqual( + mac_address_expected, + res['NetworkSettings']['MacAddress'] + ) self.client.kill(id) diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py index e009660..8b1fea3 100644 --- a/tests/integration/network_test.py +++ b/tests/integration/network_test.py @@ -38,8 +38,11 @@ class TestNetworks(api_test.BaseTestCase): self.assertEqual(net, { u'name': net_name, u'id': net_id, - u'driver': 'bridge', + u'driver': u'bridge', u'containers': {}, + u'ipam': {u'config': [{}], u'driver': u'default'}, + u'options': {}, + u'scope': u'local' }) def test_create_network_with_host_driver_fails(self): |