tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test issues with Engine 17.07 RC1 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-07-26 16:44:54 -07:00 committed by Joffrey F
parent 103f7963c4
commit 9502408ff0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/acceptance/cli_test.py
View File

@ -439,7 +439,8 @@ class CLITestCase(DockerClientTestCase):
assert 'Pulling simple (busybox:latest)...' in result.stderr assert 'Pulling simple (busybox:latest)...' in result.stderr
assert 'Pulling another (nonexisting-image:latest)...' in result.stderr assert 'Pulling another (nonexisting-image:latest)...' in result.stderr
assert ('repository nonexisting-image not found' in result.stderr or 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): def test_pull_with_quiet(self):
assert self.dispatch(['pull', '--quiet']).stderr == '' assert self.dispatch(['pull', '--quiet']).stderr == ''

3
tests/integration/service_test.py
View File

@ -210,7 +210,8 @@ class ServiceTest(DockerClientTestCase):
service.start_container(container) service.start_container(container)
self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt)) 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): def test_create_container_with_storage_opt(self):
storage_opt = {'size': '1G'} storage_opt = {'size': '1G'}
service = self.create_service('db', storage_opt=storage_opt) service = self.create_service('db', storage_opt=storage_opt)