validate:launcher: Strip env vars in command line outputing verbose

But activate if activating verbosity more than once
This commit is contained in:
Thibault Saunier 2019-06-17 17:59:21 -04:00
parent 4a250437a7
commit a994dd0ca8
2 changed files with 10 additions and 7 deletions

View file

@ -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

View file

@ -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"