Fix bad rebase

Signed-off-by: Joffrey F <[email protected]>

tests/acceptance/cli_test.py

@@ -536,24 +536,6 @@ class CLITestCase(DockerClientTestCase):
         assert self.dispatch(['pull', '--quiet']).stderr == ''
         assert self.dispatch(['pull', '--quiet']).stdout == ''
 
-    def test_pull_with_quiet(self):
-        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'])

tests/integration/testcases.py

@@ -75,7 +75,6 @@ def v2_1_only():
     return min_version_skip(V2_1)
 
 
-
 def v2_2_only():
     return min_version_skip(V2_2)
 
@@ -84,7 +83,6 @@ def v2_3_only():
     return min_version_skip(V2_3)
 
 
-
 def v3_only():
     return min_version_skip(V3_0)