Merge pull request #3036 from JesusTinoco/master

Display in the log output the name of those containers created using …
This commit is contained in:
Aanand Prasad 2016-02-29 15:17:14 -08:00
commit 210856179d
2 changed files with 2 additions and 2 deletions

View File

@ -223,7 +223,7 @@ class Service(object):
parallel_execute(
container_numbers,
lambda n: create_and_start(service=self, number=n),
lambda n: n,
lambda n: self.get_container_name(n),
"Creating and starting"
)

View File

@ -735,7 +735,7 @@ class ServiceTest(DockerClientTestCase):
self.assertEqual(len(service.containers()), 1)
self.assertTrue(service.containers()[0].is_running)
self.assertIn("ERROR: for 2 Boom", mock_stderr.getvalue())
self.assertIn("ERROR: for composetest_web_2 Boom", mock_stderr.getvalue())
def test_scale_with_unexpected_exception(self):
"""Test that when scaling if the API returns an error, that is not of type