Resolves #553, Resolves #546 - bug fixes with unit tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2014-10-18 13:54:04 -04:00
parent 2efb4f5be0
commit 7544580b4b
6 changed files with 42 additions and 3 deletions

View File

@ -11,7 +11,7 @@ def docker_client():
""" """
cert_path = os.environ.get('DOCKER_CERT_PATH', '') cert_path = os.environ.get('DOCKER_CERT_PATH', '')
if cert_path == '': if cert_path == '':
cert_path = os.path.join(os.environ.get('HOME'), '.docker') cert_path = os.path.join(os.environ.get('HOME', ''), '.docker')
base_url = os.environ.get('DOCKER_HOST') base_url = os.environ.get('DOCKER_HOST')
tls_config = None tls_config = None

View File

@ -19,7 +19,9 @@ def stream_output(output, stream):
all_events.append(event) all_events.append(event)
if 'progress' in event or 'progressDetail' in event: if 'progress' in event or 'progressDetail' in event:
image_id = event['id'] image_id = event.get('id')
if not image_id:
continue
if image_id in lines: if image_id in lines:
diff = len(lines) - lines[image_id] diff = len(lines) - lines[image_id]

View File

@ -0,0 +1,16 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import os
import mock
from tests import unittest
from fig.cli import docker_client
class DockerClientTestCase(unittest.TestCase):
def test_docker_client_no_home(self):
with mock.patch.dict(os.environ):
del os.environ['HOME']
docker_client.docker_client()

View File

@ -5,7 +5,7 @@ from tests import unittest
from fig.cli import verbose_proxy from fig.cli import verbose_proxy
class VerboseProxy(unittest.TestCase): class VerboseProxyTestCase(unittest.TestCase):
def test_format_call(self): def test_format_call(self):
expected = "(u'arg1', True, key=u'value')" expected = "(u'arg1', True, key=u'value')"

View File

@ -0,0 +1,20 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from tests import unittest
import mock
from six import StringIO
from fig import progress_stream
class ProgressStreamTestCase(unittest.TestCase):
def test_stream_output(self):
output = [
'{"status": "Downloading", "progressDetail": {"current": '
'31019763, "start": 1413653874, "total": 62763875}, '
'"progress": "..."}',
]
events = progress_stream.stream_output(output, StringIO())
self.assertEqual(len(events), 1)

View File

@ -13,3 +13,4 @@ commands =
[flake8] [flake8]
# ignore line-length for now # ignore line-length for now
ignore = E501,E203 ignore = E501,E203
exclude = fig/packages