openharmony/testfwk_xdevice
1
0
Fork 0
mirror of https://gitee.com/openharmony/testfwk_xdevice synced 2024-11-23 15:30:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update src/xdevice/_core/utils.py.

Browse Source 
Signed-off-by: <hejian3@huawei.com>
This commit is contained in:
alex_hold 2021-09-15 09:52:59 +00:00 committed by Gitee
parent bb55bc8612
commit 122dfc5198
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xdevice/_core/utils.py
View File

@ -137,7 +137,7 @@ def _get_find_proc(find_command, list_command):
return proc
def exec_cmd(cmd, timeout=5 * 60, error_print=True, join_result=False):
def exec_cmd(cmd, timeout=1 * 60, error_print=True, join_result=False):
"""
Executes commands in a new shell. Directing stderr to PIPE.
@ -154,6 +154,10 @@ def exec_cmd(cmd, timeout=5 * 60, error_print=True, join_result=False):
"""
sys_type = platform.system()
if isinstance(cmd, list):
LOG.info("The running command is: {}".format(" ".join(cmd)))
if isinstance(cmd, str):
LOG.info("The running command is: {}".format(cmd))
if sys_type == "Linux" or sys_type == "Darwin":
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=False,
@ -173,7 +177,7 @@ def exec_cmd(cmd, timeout=5 * 60, error_print=True, join_result=False):
return err if err else out
except (TimeoutError, KeyboardInterrupt, AttributeError, ValueError,
EOFError, IOError):
EOFError, IOError, subprocess.TimeoutExpired):
sys_type = platform.system()
if sys_type == "Linux" or sys_type == "Darwin":
os.killpg(proc.pid, signal.SIGTERM)