diff options
| author |   valentin boucher <valentin.boucher@orange.com> | 2016-08-23 12:36:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-23 12:36:14 +0000 |
| commit | 3c9c072e82feca7c374aa83fe7cb4466c71823ce (patch) | |
| tree | 3549717074d57f7444a82be46ecaca9ec47ad606 | |
| parent | aa427a97dcc96afe5b7c9c168470fd49e9331da8 (diff) | |
| parent | 53fd052b7fce64294c50ca170d42367d711ccc3f (diff) | |
Merge "Avoid duplicating logs in run_tests.py"
| -rwxr-xr-x | ci/run_tests.py | 2 | ||||
| -rw-r--r-- | utils/functest_utils.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/run_tests.py b/ci/run_tests.py index 758a87c2..98256721 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -102,7 +102,7 @@ def run_test(test, tier_name): cmd = ("%s%s" % (EXEC_SCRIPT, flags)) logger.debug("Executing command '%s'" % cmd) - result = ft_utils.execute_command(cmd, logger, exit_on_error=False) + result = ft_utils.execute_command(cmd, exit_on_error=False) if CLEAN_FLAG: cleanup() diff --git a/utils/functest_utils.py b/utils/functest_utils.py index 4d5004cb..b916ab12 100644 --- a/utils/functest_utils.py +++ b/utils/functest_utils.py @@ -309,7 +309,8 @@ def execute_command(cmd, logger=None, logger.debug(msg_exec) else: print(msg_exec) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) for line in iter(p.stdout.readline, b''): line = line.replace('\n', '') if logger: |