aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-08-23 13:25:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-08-23 13:41:17 +0200
commit53fd052b7fce64294c50ca170d42367d711ccc3f (patch)
tree0395085983ba4d3b95a6cd4447c7bf3d1c659335
parentda6398642446f98240d9d1bf924e959e64a73d63 (diff)
Avoid duplicating logs in run_tests.py
When run_tests.py sets logger as execute_command arg, logs are duplicated in functest.log and not shown in console (as every DEBUG message). As logger is mainly managed by the python scripts in charge of testing, it can be safely removed here. stderr is also redirected to stdout in execute_command to print possible relevant data. JIRA: FUNCTEST-431 Change-Id: Ie77544b4679e12e0a0ac7f5e5989d86862fe106b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xci/run_tests.py2
-rw-r--r--utils/functest_utils.py3
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: