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

Merge pull request #1497 from aanand/use-1.7-rc1 

Run tests against Docker 1.7 RC2
This commit is contained in:
Aanand Prasad 2015-06-10 17:19:24 -04:00
parent 17e03b29f9 4fd5d58076
commit 0e9ccd36f3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -48,11 +48,13 @@ RUN set -ex; \
rm -rf pip-7.0.1; \ rm -rf pip-7.0.1; \
rm pip-7.0.1.tar.gz rm pip-7.0.1.tar.gz
ENV ALL_DOCKER_VERSIONS 1.6.0 ENV ALL_DOCKER_VERSIONS 1.6.0 1.7.0-rc2
RUN set -ex; \ RUN set -ex; \
curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \ curl https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -o /usr/local/bin/docker-1.6.0; \
chmod +x /usr/local/bin/docker-1.6.0 chmod +x /usr/local/bin/docker-1.6.0; \
curl https://test.docker.com/builds/Linux/x86_64/docker-1.7.0-rc2 -o /usr/local/bin/docker-1.7.0-rc2; \
chmod +x /usr/local/bin/docker-1.7.0-rc2
# Set the default Docker to be run # Set the default Docker to be run
RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker RUN ln -s /usr/local/bin/docker-1.6.0 /usr/local/bin/docker

5
tests/integration/cli_test.py
View File

@ -1,6 +1,7 @@
from __future__ import absolute_import from __future__ import absolute_import
import sys import sys
import os import os
import shlex
from six import StringIO from six import StringIO
from mock import patch from mock import patch
@ -240,8 +241,8 @@ class CLITestCase(DockerClientTestCase):
service = self.project.get_service(name) service = self.project.get_service(name)
container = service.containers(stopped=True, one_off=True)[0] container = service.containers(stopped=True, one_off=True)[0]
self.assertEqual( self.assertEqual(
container.human_readable_command, shlex.split(container.human_readable_command),
u'/bin/echo helloworld' [u'/bin/echo', u'helloworld'],
) )
@patch('dockerpty.start') @patch('dockerpty.start')