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

Reduce the scope of sys.stdout patching. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-10-03 01:24:28 -04:00
parent 19271898de
commit e230142a25
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/integration/cli_test.py
View File

@ -52,32 +52,32 @@ class CLITestCase(DockerClientTestCase):
self.command.base_dir = old_base_dir self.command.base_dir = old_base_dir
# TODO: address the "Inappropriate ioctl for device" warnings in test output # TODO: address the "Inappropriate ioctl for device" warnings in test output
@mock.patch('sys.stdout', new_callable=StringIO) def test_ps(self):
def test_ps(self, mock_stdout):
self.project.get_service('simple').create_container() self.project.get_service('simple').create_container()
self.command.dispatch(['ps'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['ps'], None)
self.assertIn('simplecomposefile_simple_1', mock_stdout.getvalue()) self.assertIn('simplecomposefile_simple_1', mock_stdout.getvalue())
@mock.patch('sys.stdout', new_callable=StringIO) def test_ps_default_composefile(self):
def test_ps_default_composefile(self, mock_stdout):
self.command.base_dir = 'tests/fixtures/multiple-composefiles' self.command.base_dir = 'tests/fixtures/multiple-composefiles'
self.command.dispatch(['up', '-d'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['ps'], None) self.command.dispatch(['up', '-d'], None)
self.command.dispatch(['ps'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertIn('multiplecomposefiles_simple_1', output) self.assertIn('multiplecomposefiles_simple_1', output)
self.assertIn('multiplecomposefiles_another_1', output) self.assertIn('multiplecomposefiles_another_1', output)
self.assertNotIn('multiplecomposefiles_yetanother_1', output) self.assertNotIn('multiplecomposefiles_yetanother_1', output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_ps_alternate_composefile(self):
def test_ps_alternate_composefile(self, mock_stdout):
config_path = os.path.abspath( config_path = os.path.abspath(
'tests/fixtures/multiple-composefiles/compose2.yml') 'tests/fixtures/multiple-composefiles/compose2.yml')
self._project = get_project(self.command.base_dir, [config_path]) self._project = get_project(self.command.base_dir, [config_path])
self.command.base_dir = 'tests/fixtures/multiple-composefiles' self.command.base_dir = 'tests/fixtures/multiple-composefiles'
self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['-f', 'compose2.yml', 'ps'], None) self.command.dispatch(['-f', 'compose2.yml', 'up', '-d'], None)
self.command.dispatch(['-f', 'compose2.yml', 'ps'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertNotIn('multiplecomposefiles_simple_1', output) self.assertNotIn('multiplecomposefiles_simple_1', output)
@ -105,54 +105,51 @@ class CLITestCase(DockerClientTestCase):
mock_logging.info.assert_any_call('Pulling another (nonexisting-image:latest)...') mock_logging.info.assert_any_call('Pulling another (nonexisting-image:latest)...')
mock_logging.error.assert_any_call('Error: image library/nonexisting-image:latest not found') mock_logging.error.assert_any_call('Error: image library/nonexisting-image:latest not found')
@mock.patch('sys.stdout', new_callable=StringIO) def test_build_plain(self):
def test_build_plain(self, mock_stdout):
self.command.base_dir = 'tests/fixtures/simple-dockerfile' self.command.base_dir = 'tests/fixtures/simple-dockerfile'
self.command.dispatch(['build', 'simple'], None) self.command.dispatch(['build', 'simple'], None)
mock_stdout.truncate(0)
cache_indicator = 'Using cache' cache_indicator = 'Using cache'
pull_indicator = 'Status: Image is up to date for busybox:latest' pull_indicator = 'Status: Image is up to date for busybox:latest'
self.command.dispatch(['build', 'simple'], None)
with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['build', 'simple'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertIn(cache_indicator, output) self.assertIn(cache_indicator, output)
self.assertNotIn(pull_indicator, output) self.assertNotIn(pull_indicator, output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_build_no_cache(self):
def test_build_no_cache(self, mock_stdout):
self.command.base_dir = 'tests/fixtures/simple-dockerfile' self.command.base_dir = 'tests/fixtures/simple-dockerfile'
self.command.dispatch(['build', 'simple'], None) self.command.dispatch(['build', 'simple'], None)
mock_stdout.truncate(0)
cache_indicator = 'Using cache' cache_indicator = 'Using cache'
pull_indicator = 'Status: Image is up to date for busybox:latest' pull_indicator = 'Status: Image is up to date for busybox:latest'
self.command.dispatch(['build', '--no-cache', 'simple'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['build', '--no-cache', 'simple'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertNotIn(cache_indicator, output) self.assertNotIn(cache_indicator, output)
self.assertNotIn(pull_indicator, output) self.assertNotIn(pull_indicator, output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_build_pull(self):
def test_build_pull(self, mock_stdout):
self.command.base_dir = 'tests/fixtures/simple-dockerfile' self.command.base_dir = 'tests/fixtures/simple-dockerfile'
self.command.dispatch(['build', 'simple'], None) self.command.dispatch(['build', 'simple'], None)
mock_stdout.truncate(0)
cache_indicator = 'Using cache' cache_indicator = 'Using cache'
pull_indicator = 'Status: Image is up to date for busybox:latest' pull_indicator = 'Status: Image is up to date for busybox:latest'
self.command.dispatch(['build', '--pull', 'simple'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['build', '--pull', 'simple'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertIn(cache_indicator, output) self.assertIn(cache_indicator, output)
self.assertIn(pull_indicator, output) self.assertIn(pull_indicator, output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_build_no_cache_pull(self):
def test_build_no_cache_pull(self, mock_stdout):
self.command.base_dir = 'tests/fixtures/simple-dockerfile' self.command.base_dir = 'tests/fixtures/simple-dockerfile'
self.command.dispatch(['build', 'simple'], None) self.command.dispatch(['build', 'simple'], None)
mock_stdout.truncate(0)
cache_indicator = 'Using cache' cache_indicator = 'Using cache'
pull_indicator = 'Status: Image is up to date for busybox:latest' pull_indicator = 'Status: Image is up to date for busybox:latest'
self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
self.command.dispatch(['build', '--no-cache', '--pull', 'simple'], None)
output = mock_stdout.getvalue() output = mock_stdout.getvalue()
self.assertNotIn(cache_indicator, output) self.assertNotIn(cache_indicator, output)
self.assertIn(pull_indicator, output) self.assertIn(pull_indicator, output)

12
tests/integration/service_test.py
View File

@ -597,8 +597,7 @@ class ServiceTest(DockerClientTestCase):
self.assertNotIn('Creating', captured_output) self.assertNotIn('Creating', captured_output)
self.assertIn('Starting', captured_output) self.assertIn('Starting', captured_output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_scale_with_stopped_containers_and_needing_creation(self):
def test_scale_with_stopped_containers_and_needing_creation(self, mock_stdout):
""" """
Given there are some stopped containers and scale is called with a Given there are some stopped containers and scale is called with a
desired number that is greater than the number of stopped containers, desired number that is greater than the number of stopped containers,
@ -611,7 +610,8 @@ class ServiceTest(DockerClientTestCase):
for container in service.containers(): for container in service.containers():
self.assertFalse(container.is_running) self.assertFalse(container.is_running)
service.scale(2) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
service.scale(2)
self.assertEqual(len(service.containers()), 2) self.assertEqual(len(service.containers()), 2)
for container in service.containers(): for container in service.containers():
@ -621,8 +621,7 @@ class ServiceTest(DockerClientTestCase):
self.assertIn('Creating', captured_output) self.assertIn('Creating', captured_output)
self.assertIn('Starting', captured_output) self.assertIn('Starting', captured_output)
@mock.patch('sys.stdout', new_callable=StringIO) def test_scale_with_api_returns_errors(self):
def test_scale_with_api_returns_errors(self, mock_stdout):
""" """
Test that when scaling if the API returns an error, that error is handled Test that when scaling if the API returns an error, that error is handled
and the remaining threads continue. and the remaining threads continue.
@ -635,7 +634,8 @@ class ServiceTest(DockerClientTestCase):
'compose.container.Container.create', 'compose.container.Container.create',
side_effect=APIError(message="testing", response={}, explanation="Boom")): side_effect=APIError(message="testing", response={}, explanation="Boom")):
service.scale(3) with mock.patch('sys.stdout', new_callable=StringIO) as mock_stdout:
service.scale(3)
self.assertEqual(len(service.containers()), 1) self.assertEqual(len(service.containers()), 1)
self.assertTrue(service.containers()[0].is_running) self.assertTrue(service.containers()[0].is_running)