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

Fixes #1955 - Handle unexpected errors, but don't ignore background threads.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2015-09-09 14:38:46 -04:00 • committed by Daniel Nephin
commit 61415cd8bc
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/integration/service_test.py
View file

@ -638,8 +638,7 @@ class ServiceTest(DockerClientTestCase):
self.assertTrue(service.containers()[0].is_running)
self.assertIn("ERROR: for 2 Boom", mock_stdout.getvalue())
@mock.patch('sys.stdout', new_callable=StringIO)
def test_scale_with_api_returns_unexpected_exception(self, mock_stdout):
def test_scale_with_api_returns_unexpected_exception(self):
"""
Test that when scaling if the API returns an error, that is not of type
APIError, that error is re-raised.
@ -650,7 +649,8 @@ class ServiceTest(DockerClientTestCase):
with mock.patch(
'compose.container.Container.create',
side_effect=ValueError("BOOM")):
side_effect=ValueError("BOOM")
):
with self.assertRaises(ValueError):
service.scale(3)