issue #275: tests: fix bug in 2.6 compat check_output(), ignore it for >2.6.

This commit is contained in:
David Wilson 2018-06-24 18:30:16 +00:00
parent d6126a9516
commit 6e0883f369
1 changed files with 4 additions and 1 deletions

View File

@ -41,9 +41,12 @@ def subprocess__check_output(*popenargs, **kwargs):
cmd = kwargs.get("args") cmd = kwargs.get("args")
if cmd is None: if cmd is None:
cmd = popenargs[0] cmd = popenargs[0]
raise subprocess.CalledProcessError(retcode, cmd, output=output) raise subprocess.CalledProcessError(retcode, cmd)
return output return output
if hasattr(subprocess, 'check_output'):
subprocess__check_output = subprocess.check_output
def wait_for_port( def wait_for_port(
host, host,