diff --git a/localCoverage/push_coverage_so/push_coverage.py b/localCoverage/push_coverage_so/push_coverage.py index af2d415501bef591cd32660c4c0b1f5b15291084..be78e7cb1f8ac1d5c83a6e79b46bd86a81d7fb37 100644 --- a/localCoverage/push_coverage_so/push_coverage.py +++ b/localCoverage/push_coverage_so/push_coverage.py @@ -116,9 +116,10 @@ if __name__ == "__main__": device_ip, device_port, device_sn_strs = get_config_ip(os.path.join(developer_path, "config", "user_config.xml")) if not device_port: device_port = "8710" - device_sn_list = device_sn_strs.split(";") - if not device_sn_list: + if not device_sn_strs: device_sn_list = get_sn_list("hdc -s {}:{} list targets".format(device_ip, device_port)) + else: + device_sn_list = device_sn_strs.split(";") subsystem_list, testpart_list = [], [] param = sys.argv[1] diff --git a/localCoverage/utils.py b/localCoverage/utils.py index d853823e247fd3c7b96fcc49737fef623d0f0793..287b79cde4b96b4a19b485189d5588a4efb53e21 100644 --- a/localCoverage/utils.py +++ b/localCoverage/utils.py @@ -47,8 +47,8 @@ def get_product_name(root_path): return "" -def shell_command(command): - process = Popen(command, stdout=PIPE, stderr=STDOUT) +def shell_command(command_list: list): + process = Popen(command_list, stdout=PIPE, stderr=STDOUT) with process.stdout: for line in iter(process.stdout.readline, b""): logger(line.decode().strip(), "INFO") @@ -59,8 +59,9 @@ def shell_command(command): def hdc_command(device_ip, device_port, device_sn, command): connect_cmd = "hdc -s {}:{} -t {} ".format(device_ip, device_port, device_sn) cmd = connect_cmd + command - logger(cmd, "INFO") - _, exitcode = shell_command(cmd) + cmd_list = cmd.split(" ") + logger(cmd_list, "INFO") + _, exitcode = shell_command(cmd_list) return exitcode