docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor test refactor 

Rather than creating a docker client within each test, create one
at setup and make it accessible to the whole class.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-07-10 14:18:27 +01:00
parent 81707ef1ad
commit 2db0a377e2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/unit/project_test.py
View File

@ -9,6 +9,9 @@ import docker
class ProjectTest(unittest.TestCase): class ProjectTest(unittest.TestCase):
def setUp(self):
self.mock_client = mock.create_autospec(docker.Client)
def test_from_dict(self): def test_from_dict(self):
project = Project.from_dicts('composetest', [ project = Project.from_dicts('composetest', [
{ {
@ -155,21 +158,19 @@ class ProjectTest(unittest.TestCase):
def test_use_volumes_from_container(self): def test_use_volumes_from_container(self):
container_id = 'aabbccddee' container_id = 'aabbccddee'
container_dict = dict(Name='aaa', Id=container_id) container_dict = dict(Name='aaa', Id=container_id)
mock_client = mock.create_autospec(docker.Client) self.mock_client.inspect_container.return_value = container_dict
mock_client.inspect_container.return_value = container_dict
project = Project.from_dicts('test', [ project = Project.from_dicts('test', [
{ {
'name': 'test', 'name': 'test',
'image': 'busybox:latest', 'image': 'busybox:latest',
'volumes_from': ['aaa'] 'volumes_from': ['aaa']
} }
], mock_client) ], self.mock_client)
self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id]) self.assertEqual(project.get_service('test')._get_volumes_from(), [container_id])
def test_use_volumes_from_service_no_container(self): def test_use_volumes_from_service_no_container(self):
container_name = 'test_vol_1' container_name = 'test_vol_1'
mock_client = mock.create_autospec(docker.Client) self.mock_client.containers.return_value = [
mock_client.containers.return_value = [
{ {
"Name": container_name, "Name": container_name,
"Names": [container_name], "Names": [container_name],
@ -187,7 +188,7 @@ class ProjectTest(unittest.TestCase):
'image': 'busybox:latest', 'image': 'busybox:latest',
'volumes_from': ['vol'] 'volumes_from': ['vol']
} }
], mock_client) ], self.mock_client)
self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name]) self.assertEqual(project.get_service('test')._get_volumes_from(), [container_name])
@mock.patch.object(Service, 'containers') @mock.patch.object(Service, 'containers')
@ -211,13 +212,12 @@ class ProjectTest(unittest.TestCase):
self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids) self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids)
def test_net_unset(self): def test_net_unset(self):
mock_client = mock.create_autospec(docker.Client)
project = Project.from_dicts('test', [ project = Project.from_dicts('test', [
{ {
'name': 'test', 'name': 'test',
'image': 'busybox:latest', 'image': 'busybox:latest',
} }
], mock_client) ], self.mock_client)
service = project.get_service('test') service = project.get_service('test')
self.assertEqual(service._get_net(), None) self.assertEqual(service._get_net(), None)
self.assertNotIn('NetworkMode', service._get_container_host_config({})) self.assertNotIn('NetworkMode', service._get_container_host_config({}))
@ -225,22 +225,20 @@ class ProjectTest(unittest.TestCase):
def test_use_net_from_container(self): def test_use_net_from_container(self):
container_id = 'aabbccddee' container_id = 'aabbccddee'
container_dict = dict(Name='aaa', Id=container_id) container_dict = dict(Name='aaa', Id=container_id)
mock_client = mock.create_autospec(docker.Client) self.mock_client.inspect_container.return_value = container_dict
mock_client.inspect_container.return_value = container_dict
project = Project.from_dicts('test', [ project = Project.from_dicts('test', [
{ {
'name': 'test', 'name': 'test',
'image': 'busybox:latest', 'image': 'busybox:latest',
'net': 'container:aaa' 'net': 'container:aaa'
} }
], mock_client) ], self.mock_client)
service = project.get_service('test') service = project.get_service('test')
self.assertEqual(service._get_net(), 'container:' + container_id) self.assertEqual(service._get_net(), 'container:' + container_id)
def test_use_net_from_service(self): def test_use_net_from_service(self):
container_name = 'test_aaa_1' container_name = 'test_aaa_1'
mock_client = mock.create_autospec(docker.Client) self.mock_client.containers.return_value = [
mock_client.containers.return_value = [
{ {
"Name": container_name, "Name": container_name,
"Names": [container_name], "Names": [container_name],
@ -258,7 +256,7 @@ class ProjectTest(unittest.TestCase):
'image': 'busybox:latest', 'image': 'busybox:latest',
'net': 'container:aaa' 'net': 'container:aaa'
} }
], mock_client) ], self.mock_client)
service = project.get_service('test') service = project.get_service('test')
self.assertEqual(service._get_net(), 'container:' + container_name) self.assertEqual(service._get_net(), 'container:' + container_name)