Browse Source

Fix exit code 0 upon parallel pull failure.

Signed-off-by: Aaron Nall <[email protected]>
aronahl 8 years ago
parent
commit
2daf3628e9
1 changed files with 14 additions and 0 deletions
  1. 14 0
      tests/acceptance/cli_test.py

+ 14 - 0
tests/acceptance/cli_test.py

@@ -515,6 +515,20 @@ class CLITestCase(DockerClientTestCase):
         assert self.dispatch(['pull', '--quiet']).stderr == ''
         assert self.dispatch(['pull', '--quiet']).stdout == ''
 
+    def test_pull_with_parallel_failure(self):
+        result = self.dispatch([
+            '-f', 'ignore-pull-failures.yml', 'pull', '--parallel'],
+            returncode=1
+        )
+
+        self.assertRegexpMatches(result.stderr, re.compile('^Pulling simple', re.MULTILINE))
+        self.assertRegexpMatches(result.stderr, re.compile('^Pulling another', re.MULTILINE))
+        self.assertRegexpMatches(result.stderr,
+                                 re.compile('^ERROR: for another .*does not exist.*', re.MULTILINE))
+        self.assertRegexpMatches(result.stderr,
+                                 re.compile('''^(ERROR: )?(b')?.* nonexisting-image''',
+                                            re.MULTILINE))
+
     def test_build_plain(self):
         self.base_dir = 'tests/fixtures/simple-dockerfile'
         self.dispatch(['build', 'simple'])