From 73fd0abd5b33ee93d4e86764decdbe7d1c2584d6 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 26 Jul 2017 16:44:54 -0700 Subject: [PATCH] Fix test issues with Engine 17.07 RC1 Signed-off-by: Joffrey F --- tests/acceptance/cli_test.py | 3 ++- tests/integration/service_test.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index fc05de351..f7ecba9f5 100644 --- a/tests/acceptance/cli_test.py +++ b/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 == '' diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index 4a5ec5654..3a585ec01 100644 --- a/tests/integration/service_test.py +++ b/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)