summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/integration/container_test.py12
-rw-r--r--tests/integration/network_test.py5
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):