X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fcommon%2Futils.py;h=a77a4cad61ca2130fefe06bf4b617ea51a581ab4;hb=14a0f0b13e37cf0a65603915b7c75b86fd4a4383;hp=4952901229859278d5204a45a4d7ba862c2a94b6;hpb=fe8bd59413e3525849f9b75752d657a737b5a0ad;p=yardstick.git diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py index 495290122..a77a4cad6 100644 --- a/yardstick/common/utils.py +++ b/yardstick/common/utils.py @@ -31,6 +31,7 @@ import six from flask import jsonify from six.moves import configparser from oslo_serialization import jsonutils +from oslo_utils import encodeutils import yardstick @@ -106,13 +107,12 @@ def remove_file(path): raise -def execute_command(cmd): +def execute_command(cmd, **kwargs): exec_msg = "Executing command: '%s'" % cmd logger.debug(exec_msg) - output = subprocess.check_output(cmd.split()).split(os.linesep) - - return output + output = subprocess.check_output(cmd.split(), **kwargs) + return encodeutils.safe_decode(output, incoming='utf-8').split(os.linesep) def source_env(env_file):