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

Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-06-10 17:19:24 -04:00
commit ad4cc5d6df
2 changed files with 7 additions and 4 deletions

View file

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