jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some minor cleanup from yelp/fig

Browse source 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
This commit is contained in:
Daniel Nephin 2014-12-11 10:08:39 -08:00
commit 3c0f297ba6
5 changed files with 42 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/unit/cli/docker_client_test.py
View file

@ -14,3 +14,9 @@ class DockerClientTestCase(unittest.TestCase):
with mock.patch.dict(os.environ):
del os.environ['HOME']
docker_client.docker_client()
def test_docker_client_with_custom_timeout(self):
with mock.patch.dict(os.environ):
os.environ['DOCKER_CLIENT_TIMEOUT'] = timeout = "300"
client = docker_client.docker_client()
self.assertEqual(client._timeout, int(timeout))

12
tests/unit/service_test.py
View file

@ -165,23 +165,21 @@ class ServiceTest(unittest.TestCase):
self.assertEqual(opts['domainname'], 'domain.tld', 'domainname')
def test_get_container_not_found(self):
mock_client = mock.create_autospec(docker.Client)
mock_client.containers.return_value = []
service = Service('foo', client=mock_client)
self.mock_client.containers.return_value = []
service = Service('foo', client=self.mock_client)
self.assertRaises(ValueError, service.get_container)
@mock.patch('fig.service.Container', autospec=True)
def test_get_container(self, mock_container_class):
mock_client = mock.create_autospec(docker.Client)
container_dict = dict(Name='default_foo_2')
mock_client.containers.return_value = [container_dict]
service = Service('foo', client=mock_client)
self.mock_client.containers.return_value = [container_dict]
service = Service('foo', client=self.mock_client)
container = service.get_container(number=2)
self.assertEqual(container, mock_container_class.from_ps.return_value)
mock_container_class.from_ps.assert_called_once_with(
mock_client, container_dict)
self.mock_client, container_dict)
@mock.patch('fig.service.log', autospec=True)
def test_pull_image(self, mock_log):