ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/iscsi_tgt: fixup bytes to str for python 3.5

Browse Source 
Change-Id: Ia73e950c746fb23f1188dc09a4a34c8ba5f97985
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Reviewed-on: https://review.gerrithub.io/436680
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Tomasz Kulasek 2018-12-10 15:18:58 +01:00 committed by Jim Harris
parent 04d09f9207
commit c68c2d28c1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/iscsi_tgt/calsoft/calsoft.py
View File

@ -37,7 +37,7 @@ known_failed_cases = ['tc_ffp_15_2', 'tc_ffp_29_2', 'tc_ffp_29_3', 'tc_ffp_29_4'
def run_case(case, result_list, log_dir_path): def run_case(case, result_list, log_dir_path):
try: try:
case_log = subprocess.check_output("{}/{}".format(CALSOFT_BIN_PATH, case), stderr=subprocess.STDOUT, shell=True) case_log = subprocess.check_output("{}/{}".format(CALSOFT_BIN_PATH, case), stderr=subprocess.STDOUT, shell=True).decode('utf-8')
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
result_list.append({"Name": case, "Result": "FAIL"}) result_list.append({"Name": case, "Result": "FAIL"})
case_log = e.output case_log = e.output

2
test/iscsi_tgt/rpc_config/rpc_config.py
View File

@ -65,7 +65,7 @@ class spdk_rpc(object):
cmd = "{} {}".format(self.rpc_py, name) cmd = "{} {}".format(self.rpc_py, name)
for arg in args: for arg in args:
cmd += " {}".format(arg) cmd += " {}".format(arg)
return check_output(cmd, shell=True) return check_output(cmd, shell=True).decode("utf-8")
return call return call