Merge "Fix unit tests in python3"
This commit is contained in:
commit
86b38ebc06
@ -38,7 +38,7 @@ class ScriptTestBase(base.BaseTestCase):
|
|||||||
try:
|
try:
|
||||||
return subprocess.check_output(cmd,
|
return subprocess.check_output(cmd,
|
||||||
stderr=subprocess.STDOUT,
|
stderr=subprocess.STDOUT,
|
||||||
env=self.env)
|
env=self.env).decode('utf-8')
|
||||||
# NOTE(bnemec): If we don't handle this exception, all we get is the
|
# NOTE(bnemec): If we don't handle this exception, all we get is the
|
||||||
# exit code if the command fails.
|
# exit code if the command fails.
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
|
Loading…
Reference in New Issue
Block a user