From: Ross Brattain Date: Wed, 25 Jan 2017 00:30:25 +0000 (-0800) Subject: Fix: network_services: decode stdout instead of encode X-Git-Tag: danube.1.0~118 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F27479%2F3;p=yardstick.git Fix: network_services: decode stdout instead of encode Fixes unittest on Python 3 stdout is bytes, so we need to decode bytes to unicode using utf-8 bytes.decode(); str.encode() Change-Id: I4b19d237139f338a648d04aa44cd4f199bb901c3 Signed-off-by: Ross Brattain --- diff --git a/yardstick/network_services/utils.py b/yardstick/network_services/utils.py index 80e0a631c..b75091326 100644 --- a/yardstick/network_services/utils.py +++ b/yardstick/network_services/utils.py @@ -53,7 +53,7 @@ def provision_tool(connection, tool_path): bin_path = get_nsb_option("bin_path") exit_status, stdout = connection.execute("which %s" % tool_path)[:2] if exit_status == 0: - return encodeutils.safe_encode(stdout, incoming='utf-8').rstrip() + return encodeutils.safe_decode(stdout, incoming='utf-8').rstrip() logging.warning("%s not found on %s, will try to copy from localhost", tool_path, connection.host)