On Fri, Aug 10, 2012 at 3:16 AM, Feng Yang <[email protected]> wrote: > This patch add verbose parameter to utils.system and utils.system_output > to control log cmd to debug or not.
Fair enough, applied! > Signed-off-by: Feng Yang <[email protected]> > --- > client/shared/base_utils.py | 13 ++++++++----- > 1 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/client/shared/base_utils.py b/client/shared/base_utils.py > index 363a6a2..9f3489c 100644 > --- a/client/shared/base_utils.py > +++ b/client/shared/base_utils.py > @@ -1121,7 +1121,7 @@ def nuke_pid(pid, signal_queue=(signal.SIGTERM, > signal.SIGKILL)): > raise error.AutoservRunError('Could not kill %d' % pid, None) > > > -def system(command, timeout=None, ignore_status=False): > +def system(command, timeout=None, ignore_status=False, verbose=True): > """ > Run a command > > @@ -1129,12 +1129,14 @@ def system(command, timeout=None, > ignore_status=False): > @param ignore_status: if ignore_status=False, throw an exception if the > command's exit code is non-zero > if ignore_status=True, return the exit code. > + @param verbose: if True, log the command being run. > > @return exit status of command > (note, this will always be zero unless ignore_status=True) > """ > return run(command, timeout=timeout, ignore_status=ignore_status, > - stdout_tee=TEE_TO_LOGS, stderr_tee=TEE_TO_LOGS).exit_status > + stdout_tee=TEE_TO_LOGS, stderr_tee=TEE_TO_LOGS, > + verbose=verbose).exit_status > > > def system_parallel(commands, timeout=None, ignore_status=False): > @@ -1146,7 +1148,7 @@ def system_parallel(commands, timeout=None, > ignore_status=False): > > > def system_output(command, timeout=None, ignore_status=False, > - retain_output=False, args=()): > + retain_output=False, args=(), verbose=True): > """ > Run a command and return the stdout output. > > @@ -1162,16 +1164,17 @@ def system_output(command, timeout=None, > ignore_status=False, > inside " quotes after they have been escaped for that; each > element in the sequence will be given as a separate command > argument > + @param verbose: if True, log the command being run. > > @return a string with the stdout output of the command. > """ > if retain_output: > out = run(command, timeout=timeout, ignore_status=ignore_status, > stdout_tee=TEE_TO_LOGS, stderr_tee=TEE_TO_LOGS, > - args=args).stdout > + verbose=verbose, args=args).stdout > else: > out = run(command, timeout=timeout, ignore_status=ignore_status, > - args=args).stdout > + verbose=verbose, args=args).stdout > if out[-1:] == '\n': > out = out[:-1] > return out > -- > 1.7.7.6 > > _______________________________________________ > Autotest-kernel mailing list > [email protected] > https://www.redhat.com/mailman/listinfo/autotest-kernel -- Lucas _______________________________________________ Autotest-kernel mailing list [email protected] https://www.redhat.com/mailman/listinfo/autotest-kernel
