Commit c68c2d28 authored by Tomasz Kulasek's avatar Tomasz Kulasek Committed by Jim Harris
Browse files

test/iscsi_tgt: fixup bytes to str for python 3.5 



Change-Id: Ia73e950c746fb23f1188dc09a4a34c8ba5f97985
Signed-off-by: default avatarTomasz 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 04d09f92

test/iscsi_tgt/calsoft/calsoft.py

+1 −1
Original line number Diff line number Diff line
@@ -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):

    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:

        result_list.append({"Name": case, "Result": "FAIL"})

        case_log = e.output

test/iscsi_tgt/rpc_config/rpc_config.py

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class spdk_rpc(object): 
            cmd = "{} {}".format(self.rpc_py, name)

            for arg in args:

                cmd += " {}".format(arg)

            return check_output(cmd, shell=True)

            return check_output(cmd, shell=True).decode("utf-8")

        return call