Merge "Fix retries when pushing images"
This commit is contained in:
commit
29e4cb118a
|
@ -373,6 +373,9 @@ class PushTask(DockerTask):
|
|||
image.status = STATUS_ERROR
|
||||
self.logger.error(response['errorDetail']['message'])
|
||||
|
||||
# Reset any previous errors.
|
||||
image.status = STATUS_BUILT
|
||||
|
||||
|
||||
class BuildTask(DockerTask):
|
||||
"""Task that builds out an image."""
|
||||
|
|
|
@ -77,6 +77,40 @@ class TasksTest(base.TestCase):
|
|||
pusher.run()
|
||||
mock_client().push.assert_called_once_with(
|
||||
self.image.canonical_name, decode=True, stream=True)
|
||||
self.assertTrue(pusher.success)
|
||||
|
||||
@mock.patch('docker.version', '3.0.0')
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure(self, mock_client):
|
||||
self.dc = mock_client
|
||||
mock_client().push.side_effect = Exception
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
pusher.run()
|
||||
mock_client().push.assert_called_once_with(
|
||||
self.image.canonical_name, decode=True, stream=True)
|
||||
self.assertFalse(pusher.success)
|
||||
self.assertEqual(build.STATUS_PUSH_ERROR, self.image.status)
|
||||
|
||||
@mock.patch('docker.version', '3.0.0')
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
def test_push_image_failure_retry(self, mock_client):
|
||||
self.dc = mock_client
|
||||
mock_client().push.side_effect = [Exception, []]
|
||||
pusher = build.PushTask(self.conf, self.image)
|
||||
pusher.run()
|
||||
mock_client().push.assert_called_once_with(
|
||||
self.image.canonical_name, decode=True, stream=True)
|
||||
self.assertFalse(pusher.success)
|
||||
self.assertEqual(build.STATUS_PUSH_ERROR, self.image.status)
|
||||
|
||||
# Try again, this time without exception.
|
||||
pusher.reset()
|
||||
pusher.run()
|
||||
self.assertEqual(2, mock_client().push.call_count)
|
||||
self.assertTrue(pusher.success)
|
||||
self.assertEqual(build.STATUS_BUILT, self.image.status)
|
||||
|
||||
@mock.patch.dict(os.environ, clear=True)
|
||||
@mock.patch('docker.APIClient')
|
||||
|
|
Loading…
Reference in New Issue