Merge pull request #2254 from mnowster/1756-dont-display-output-from-previous-runs

1756 dont display output from previous runs
This commit is contained in:
Daniel Nephin 2015-10-27 18:45:47 -04:00
commit b6b9b002e5
9 changed files with 62 additions and 33 deletions

View file

@ -16,6 +16,7 @@ def build_mock_container(reader):
name='myapp_web_1',
name_without_project='web_1',
has_api_logs=True,
log_stream=None,
attach=reader,
wait=mock.Mock(return_value=0),
)

View file

@ -323,9 +323,7 @@ class ServiceTest(unittest.TestCase):
new_container = service.recreate_container(mock_container)
mock_container.stop.assert_called_once_with(timeout=10)
self.mock_client.rename.assert_called_once_with(
mock_container.id,
'%s_%s' % (mock_container.short_id, mock_container.name))
mock_container.rename_to_tmp_name.assert_called_once_with()
new_container.start.assert_called_once_with()
mock_container.remove.assert_called_once_with()