Refactor network_mode logic out of Service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
d92f323e6d
commit
805f6a7683
4 changed files with 133 additions and 51 deletions
|
|
@ -220,7 +220,7 @@ class ProjectTest(unittest.TestCase):
|
|||
}
|
||||
], self.mock_client)
|
||||
service = project.get_service('test')
|
||||
self.assertEqual(service._get_net(), None)
|
||||
self.assertEqual(service.net.id, None)
|
||||
self.assertNotIn('NetworkMode', service._get_container_host_config({}))
|
||||
|
||||
def test_use_net_from_container(self):
|
||||
|
|
@ -235,7 +235,7 @@ class ProjectTest(unittest.TestCase):
|
|||
}
|
||||
], self.mock_client)
|
||||
service = project.get_service('test')
|
||||
self.assertEqual(service._get_net(), 'container:' + container_id)
|
||||
self.assertEqual(service.net.mode, 'container:' + container_id)
|
||||
|
||||
def test_use_net_from_service(self):
|
||||
container_name = 'test_aaa_1'
|
||||
|
|
@ -260,7 +260,7 @@ class ProjectTest(unittest.TestCase):
|
|||
], self.mock_client)
|
||||
|
||||
service = project.get_service('test')
|
||||
self.assertEqual(service._get_net(), 'container:' + container_name)
|
||||
self.assertEqual(service.net.mode, 'container:' + container_name)
|
||||
|
||||
def test_container_without_name(self):
|
||||
self.mock_client.containers.return_value = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue