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

Update unit tests for stream_output to match the behaviour of a docker-py response.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2015-08-24 13:16:13 -04:00
commit 71ff872e8e
8 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/legacy_test.py
View file

@ -1,8 +1,8 @@
import unittest
from docker.errors import APIError
from mock import Mock
from .. import mock
from .testcases import DockerClientTestCase
from compose import legacy
from compose.project import Project
@ -66,7 +66,7 @@ class UtilitiesTestCase(unittest.TestCase):
)
def test_get_legacy_containers(self):
client = Mock()
client = mock.Mock()
client.containers.return_value = [
{
"Id": "abc123",

18
tests/unit/progress_stream_test.py
View file

@ -10,27 +10,27 @@ from tests import unittest
class ProgressStreamTestCase(unittest.TestCase):
def test_stream_output(self):
output = [
'{"status": "Downloading", "progressDetail": {"current": '
'31019763, "start": 1413653874, "total": 62763875}, '
'"progress": "..."}',
b'{"status": "Downloading", "progressDetail": {"current": '
b'31019763, "start": 1413653874, "total": 62763875}, '
b'"progress": "..."}',
]
events = progress_stream.stream_output(output, StringIO())
self.assertEqual(len(events), 1)
def test_stream_output_div_zero(self):
output = [
'{"status": "Downloading", "progressDetail": {"current": '
'0, "start": 1413653874, "total": 0}, '
'"progress": "..."}',
b'{"status": "Downloading", "progressDetail": {"current": '
b'0, "start": 1413653874, "total": 0}, '
b'"progress": "..."}',
]
events = progress_stream.stream_output(output, StringIO())
self.assertEqual(len(events), 1)
def test_stream_output_null_total(self):
output = [
'{"status": "Downloading", "progressDetail": {"current": '
'0, "start": 1413653874, "total": null}, '
'"progress": "..."}',
b'{"status": "Downloading", "progressDetail": {"current": '
b'0, "start": 1413653874, "total": null}, '
b'"progress": "..."}',
]
events = progress_stream.stream_output(output, StringIO())
self.assertEqual(len(events), 1)

2
tests/unit/service_test.py
View file

@ -280,7 +280,7 @@ class ServiceTest(unittest.TestCase):
def test_build_does_not_pull(self):
self.mock_client.build.return_value = [
'{"stream": "Successfully built 12345"}',
b'{"stream": "Successfully built 12345"}',
]
service = Service('foo', client=self.mock_client, build='.')