From 03879d4d55b88d355555985b78ff10984551164a Mon Sep 17 00:00:00 2001 From: James Saryerwinnie Date: Wed, 26 Mar 2014 18:02:32 -0700 Subject: [PATCH] Bug fix for integ test on windows wiht py3 Subprocess expectes str() not bytes() and will try to process the arg as a list if it receives bytes(). --- tests/integration/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index ce94dcb47338..fdde49286117 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -84,7 +84,7 @@ def aws(command, collect_memory=False, env_vars=None, aws_command = 'python %s' % AWS_CMD full_command = '%s %s' % (aws_command, command) stdout_encoding = _get_stdout_encoding() - if isinstance(full_command, six.text_type): + if isinstance(full_command, six.text_type) and not six.PY3: full_command = full_command.encode(stdout_encoding) LOG.debug("Running command: %s", full_command) env = os.environ.copy()