diff --git a/tests/TestHarness/testUtils.py b/tests/TestHarness/testUtils.py index 2cbe58650c..e7001ab293 100755 --- a/tests/TestHarness/testUtils.py +++ b/tests/TestHarness/testUtils.py @@ -205,7 +205,7 @@ def checkDelayedOutput(popen, cmd, ignoreError=False): Utils.checkOutputFileWrite(start, cmd, output, error) if popen.returncode != 0 and not ignoreError: raise subprocess.CalledProcessError(returncode=popen.returncode, cmd=cmd, output=output, stderr=error) - return output.decode("utf-8") + return output.decode("utf-8") if popen.returncode == 0 else error.decode("utf-8") @staticmethod def errorExit(msg="", raw=False, errorCode=1): @@ -304,13 +304,13 @@ def runCmdArrReturnJson(cmdArr, trace=False, silentErrors=True): return Utils.toJson(retStr) @staticmethod - def runCmdReturnStr(cmd, trace=False): + def runCmdReturnStr(cmd, trace=False, ignoreError=False): cmdArr=shlex.split(cmd) - return Utils.runCmdArrReturnStr(cmdArr) + return Utils.runCmdArrReturnStr(cmdArr, ignoreError=ignoreError) @staticmethod - def runCmdArrReturnStr(cmdArr, trace=False): - retStr=Utils.checkOutput(cmdArr) + def runCmdArrReturnStr(cmdArr, trace=False, ignoreError=False): + retStr=Utils.checkOutput(cmdArr, ignoreError=ignoreError) if trace: Utils.Print ("RAW > %s" % (retStr)) return retStr