Fix test issues with Engine 17.07 RC1

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

tests/acceptance/cli_test.py

@@ -439,7 +439,8 @@ class CLITestCase(DockerClientTestCase):
         assert 'Pulling simple (busybox:latest)...' in result.stderr
         assert 'Pulling another (nonexisting-image:latest)...' in result.stderr
         assert ('repository nonexisting-image not found' in result.stderr or
-                'image library/nonexisting-image:latest not found' in result.stderr)
+                'image library/nonexisting-image:latest not found' in result.stderr or
+                'pull access denied for nonexisting-image' in result.stderr)
 
     def test_pull_with_quiet(self):
         assert self.dispatch(['pull', '--quiet']).stderr == ''

tests/integration/service_test.py

@@ -210,7 +210,8 @@ class ServiceTest(DockerClientTestCase):
         service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt))
 
-    @pytest.mark.xfail(True, reason='Not supported on most drivers')
+    # @pytest.mark.xfail(True, reason='Not supported on most drivers')
+    @pytest.mark.skipif(True, reason='https://github.com/moby/moby/issues/34270')
     def test_create_container_with_storage_opt(self):
         storage_opt = {'size': '1G'}
         service = self.create_service('db', storage_opt=storage_opt)