Include networks in the config_hash.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
0810eeba10
commit
e551988616
6 changed files with 19 additions and 10 deletions
|
|
@ -406,7 +406,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
|
||||
services = self.project.get_services()
|
||||
|
||||
network_name = self.project.networks.networks['default']
|
||||
network_name = self.project.networks.networks['default'].full_name
|
||||
networks = self.client.networks(names=[network_name])
|
||||
self.assertEqual(len(networks), 1)
|
||||
self.assertEqual(networks[0]['Driver'], 'bridge')
|
||||
|
|
@ -440,7 +440,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
|
||||
self.dispatch(['-f', filename, 'up', '-d'], None)
|
||||
|
||||
network_name = self.project.networks.networks['default']
|
||||
network_name = self.project.networks.networks['default'].full_name
|
||||
networks = self.client.networks(names=[network_name])
|
||||
|
||||
assert networks[0]['Options']['com.docker.network.bridge.enable_icc'] == 'false'
|
||||
|
|
@ -596,7 +596,7 @@ class CLITestCase(DockerClientTestCase):
|
|||
self.dispatch(['up', '-d', 'web'], None)
|
||||
|
||||
# No network was created
|
||||
network_name = self.project.networks.networks['default']
|
||||
network_name = self.project.networks.networks['default'].full_name
|
||||
networks = self.client.networks(names=[network_name])
|
||||
assert networks == []
|
||||
|
||||
|
|
|
|||
|
|
@ -832,7 +832,8 @@ class ProjectTest(DockerClientTestCase):
|
|||
)
|
||||
project = Project.from_config(
|
||||
name='composetest',
|
||||
config_data=config_data, client=self.client
|
||||
config_data=config_data,
|
||||
client=self.client
|
||||
)
|
||||
with self.assertRaises(config.ConfigurationError) as e:
|
||||
project.initialize_volumes()
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ class ServiceTest(unittest.TestCase):
|
|||
|
||||
self.assertEqual(
|
||||
opts['labels'][LABEL_CONFIG_HASH],
|
||||
'3c85881a8903b9d73a06c41860c8be08acce1494ab4cf8408375966dccd714de')
|
||||
'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
|
||||
self.assertEqual(
|
||||
opts['environment'],
|
||||
{
|
||||
|
|
@ -417,9 +417,10 @@ class ServiceTest(unittest.TestCase):
|
|||
'options': {'image': 'example.com/foo'},
|
||||
'links': [('one', 'one')],
|
||||
'net': 'other',
|
||||
'networks': [],
|
||||
'volumes_from': [('two', 'rw')],
|
||||
}
|
||||
self.assertEqual(config_dict, expected)
|
||||
assert config_dict == expected
|
||||
|
||||
def test_config_dict_with_network_mode_from_container(self):
|
||||
self.mock_client.inspect_image.return_value = {'Id': 'abcd'}
|
||||
|
|
@ -437,10 +438,11 @@ class ServiceTest(unittest.TestCase):
|
|||
'image_id': 'abcd',
|
||||
'options': {'image': 'example.com/foo'},
|
||||
'links': [],
|
||||
'networks': [],
|
||||
'net': 'aaabbb',
|
||||
'volumes_from': [],
|
||||
}
|
||||
self.assertEqual(config_dict, expected)
|
||||
assert config_dict == expected
|
||||
|
||||
def test_remove_image_none(self):
|
||||
web = Service('web', image='example', client=self.mock_client)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue