Merge "Support py3.5"
This commit is contained in:
commit
039f2c9c02
@ -36,7 +36,9 @@ class DockerRunner(object):
|
|||||||
cmd_stdout, cmd_stderr = subproc.communicate()
|
cmd_stdout, cmd_stderr = subproc.communicate()
|
||||||
LOG.debug(cmd_stdout)
|
LOG.debug(cmd_stdout)
|
||||||
LOG.debug(cmd_stderr)
|
LOG.debug(cmd_stderr)
|
||||||
return cmd_stdout, cmd_stderr, subproc.returncode
|
return (cmd_stdout.decode('utf-8'),
|
||||||
|
cmd_stderr.decode('utf-8'),
|
||||||
|
subproc.returncode)
|
||||||
|
|
||||||
def current_config_ids(self):
|
def current_config_ids(self):
|
||||||
# List all config_id labels for managed containers
|
# List all config_id labels for managed containers
|
||||||
|
@ -28,7 +28,8 @@ class TestDockerRunner(base.TestCase):
|
|||||||
def mock_execute(self, popen, stdout, stderr, returncode):
|
def mock_execute(self, popen, stdout, stderr, returncode):
|
||||||
subproc = mock.Mock()
|
subproc = mock.Mock()
|
||||||
subproc.returncode = returncode
|
subproc.returncode = returncode
|
||||||
subproc.communicate.return_value = (stdout, stderr)
|
subproc.communicate.return_value = (stdout.encode('utf-8'),
|
||||||
|
stderr.encode('utf-8'))
|
||||||
popen.return_value = subproc
|
popen.return_value = subproc
|
||||||
|
|
||||||
def assert_execute(self, popen, cmd):
|
def assert_execute(self, popen, cmd):
|
||||||
|
@ -16,8 +16,7 @@ classifier =
|
|||||||
Programming Language :: Python :: 2
|
Programming Language :: Python :: 2
|
||||||
Programming Language :: Python :: 2.7
|
Programming Language :: Python :: 2.7
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.3
|
Programming Language :: Python :: 3.5
|
||||||
Programming Language :: Python :: 3.4
|
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
packages =
|
packages =
|
||||||
|
Loading…
Reference in New Issue
Block a user