From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Thu, 21 Jan 2016 08:26:47 +0000 (+0000)
Subject: Add control to redirect rally stderr
X-Git-Tag: brahmaputra.1.0~134
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d9918d3fac6223b3460ebfa1b68c3e677e47c60d;p=functest.git

Add control to redirect rally stderr

By default rally stderr output is suppressed. Option --verbose enables
the output by redirecting it to stdout.

Change-Id: I2fd372b2a5cd70095969ef926bc9675dde4f98f6
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
(cherry picked from commit c2fcca7373e4b65d4eec221e020bc49c9e443a70)
---

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index 17a6596d3..1c27b0273 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -49,12 +49,19 @@ parser.add_argument("-r", "--report",
 parser.add_argument("-s", "--smoke",
                     help="Smoke test mode",
                     action="store_true")
+parser.add_argument("-v", "--verbose",
+                    help="Print verbose info about the progress",
+                    action="store_true")
 
 args = parser.parse_args()
 
 client_dict = {}
 
-FNULL = open(os.devnull, 'w')
+if args.verbose:
+    RALLY_STDERR = subprocess.STDOUT
+else:
+    RALLY_STDERR = open(os.devnull, 'w')
+
 """ logging configuration """
 logger = logging.getLogger("run_rally")
 logger.setLevel(logging.DEBUG)
@@ -211,7 +218,7 @@ def run_task(test_name):
                "--task-args \"{}\" ".format(build_task_args(test_name))
     logger.debug('running command line : {}'.format(cmd_line))
 
-    p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=FNULL, shell=True)
+    p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=RALLY_STDERR, shell=True)
     result = ""
     while p.poll() is None:
         l = p.stdout.readline()
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally.py b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
old mode 100644
new mode 100755
index a7f1db13a..d1088014c
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
@@ -44,11 +44,17 @@ parser.add_argument("-d", "--debug", help="Debug mode",  action="store_true")
 parser.add_argument("-r", "--report",
                     help="Create json result file",
                     action="store_true")
+parser.add_argument("-v", "--verbose",
+                    help="Print verbose info about the progress",
+                    action="store_true")
 
 args = parser.parse_args()
 
+if args.verbose:
+    RALLY_STDERR = subprocess.STDOUT
+else:
+    RALLY_STDERR = open(os.devnull, 'w')
 
-FNULL = open(os.devnull, 'w')
 """ logging configuration """
 logger = logging.getLogger("run_rally")
 logger.setLevel(logging.DEBUG)
@@ -164,7 +170,7 @@ def run_task(test_name):
         logger.debug('Scenario fetched from : {}'.format(test_file_name))
         cmd_line = "rally task start --abort-on-sla-failure {}".format(test_file_name)
         logger.debug('running command line : {}'.format(cmd_line))
-        p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=FNULL, shell=True)
+        p = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=RALLY_STDERR, shell=True)
         result = ""
         while p.poll() is None:
             l = p.stdout.readline()