From a994dd0ca8c7fa7ac00c7d9f6f4ae0040b2c85c3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 17 Jun 2019 17:59:21 -0400 Subject: [PATCH] validate:launcher: Strip env vars in command line outputing verbose But activate if activating verbosity more than once --- validate/launcher/baseclasses.py | 15 +++++++++------ validate/launcher/main.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 655ad71..906a686 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -214,12 +214,15 @@ class Test(Loggable): @property def _env_variable(self): res = "" - for var in set(self.__env_variable): - if res: - res += " " - value = self.proc_env.get(var, None) - if value is not None: - res += "%s='%s'" % (var, value) + if not self.options.verbose or self.options.verbose > 1: + for var in set(self.__env_variable): + if res: + res += " " + value = self.proc_env.get(var, None) + if value is not None: + res += "%s='%s'" % (var, value) + else: + res += "[Not displaying environment variables, rerun with -vv for the full command]" return res diff --git a/validate/launcher/main.py b/validate/launcher/main.py index 31c70bf..8fbc4f4 100644 --- a/validate/launcher/main.py +++ b/validate/launcher/main.py @@ -520,7 +520,7 @@ class LauncherConfig(Loggable): dir_group.add_argument("-rl", "--redirect-logs", dest="redirect_logs", help="Redirect logs to 'stdout' or 'sdterr'.") dir_group.add_argument("-v", "--verbose", dest="verbose", - default=False, action='store_true', + action='count', help="Redirect logs to stdout.") dir_group.add_argument("-j", "--jobs", dest="num_jobs", help="Number of tests to execute simultaneously" -- 2.7.4