Fix: network_services: decode stdout instead of encode 79/27479/3
authorRoss Brattain <ross.b.brattain@intel.com>
Wed, 25 Jan 2017 00:30:25 +0000 (16:30 -0800)
committerRoss Brattain <ross.b.brattain@intel.com>
Mon, 6 Feb 2017 07:57:36 +0000 (07:57 +0000)
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 <ross.b.brattain@intel.com>
yardstick/network_services/utils.py

index 80e0a63..b750913 100644 (file)
@@ -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)