From ada931de19c4ea15515abf815698457f2721cadb Mon Sep 17 00:00:00 2001 From: wang biao Date: Sat, 6 May 2023 14:36:22 +0800 Subject: [PATCH] fix nostestest3 run error case Change-Id: Ifb252ddccfb5fac27ad481f803a368b0aa62aea3 Signed-off-by: wang biao --- mic/utils/runner.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mic/utils/runner.py b/mic/utils/runner.py index e22d734..c06dd4e 100644 --- a/mic/utils/runner.py +++ b/mic/utils/runner.py @@ -46,25 +46,22 @@ def runtool(cmdln_or_args, catch=1): cmd = shlex.split(cmdln_or_args)[0] shell = True - if catch != 3: - dev_null = os.open("/dev/null", os.O_WRONLY) - if catch == 0: - sout = dev_null - serr = dev_null + sout = subprocess.DEVNULL + serr = subprocess.DEVNULL elif catch == 1: sout = subprocess.PIPE - serr = dev_null + serr = subprocess.DEVNULL elif catch == 2: - sout = dev_null + sout = subprocess.DEVNULL serr = subprocess.PIPE elif catch == 3: sout = subprocess.PIPE serr = subprocess.STDOUT try: - p = subprocess.Popen(cmdln_or_args, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=shell, universal_newlines=True) + p = subprocess.Popen(cmdln_or_args, stdout=sout, + stderr=serr, shell=shell, universal_newlines=True) (sout, serr) = p.communicate() # combine stdout and stderr, filter None out out = ''.join([_f for _f in [sout, serr] if _f]) -- 2.7.4