Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 00:30:47 +01:00
Code Releases Activity

test-runner: fix duplicate process output

Browse Source 
Process output was being duplicated when -v was used. This was
due to both stderr and stdout being appended to the write_fd list
as well as stderr being set to stdout in the Popen call.

To fix this only stdout should be appended to the write_fd list,
but then there comes a problem with closing the streams. stdout
cannot be closed, so instead it is special cased. A new
verbose boolean was added to Process which, if True, will
cause any output to be written to stdout explicitly.
This commit is contained in:
James Prestwood 2021-03-02 08:30:29 -08:00 committed by Denis Kenzior
parent e714e72e05
commit 66b4723216
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/test-runner
View File

@ -174,6 +174,7 @@ class Process:
self.write_fds = [] self.write_fds = []
self.io_watch = None self.io_watch = None
self.cleanup = cleanup self.cleanup = cleanup
self.verbose = False
if not namespace: if not namespace:
self.output_name = '/tmp/%s-out' % self.name self.output_name = '/tmp/%s-out' % self.name
@ -195,8 +196,7 @@ class Process:
if ctx: if ctx:
# Verbose requested, add stdout/stderr to write FD list # Verbose requested, add stdout/stderr to write FD list
if self.name in ctx.args.verbose: if self.name in ctx.args.verbose:
self.write_fds.append(sys.__stdout__) self.verbose = True
self.write_fds.append(sys.__stderr__)
# Add output file to FD list # Add output file to FD list
if outfile: if outfile:
@ -230,11 +230,11 @@ class Process:
# the process is being waited for, the log/outfile bits # the process is being waited for, the log/outfile bits
# will be handled after the process exists. # will be handled after the process exists.
# #
if self.write_fds != [] and not wait and not check: if self.write_fds != [] and not wait and not check or self.verbose:
self.io_watch = GLib.io_add_watch(self.stdout, GLib.IO_IN, self.io_watch = GLib.io_add_watch(self.stdout, GLib.IO_IN,
self.io_callback) self.io_callback)
self.pid = subprocess.Popen(self.args, stdout=self.stdout, stderr=subprocess.STDOUT, self.pid = subprocess.Popen(self.args, stdout=self.stdout, stderr=self.stdout,
env=env, cwd=os.getcwd()) env=env, cwd=os.getcwd())
print("Starting process {}".format(self.pid.args)) print("Starting process {}".format(self.pid.args))
@ -261,6 +261,9 @@ class Process:
self.write_fds = [] self.write_fds = []
if self.verbose:
sys.__stdout__.write(self.out)
print("%s returned %d" % (args[0], self.ret)) print("%s returned %d" % (args[0], self.ret))
if check and self.ret != 0: if check and self.ret != 0:
raise subprocess.CalledProcessError(returncode=self.ret, cmd=self.args) raise subprocess.CalledProcessError(returncode=self.ret, cmd=self.args)
@ -284,6 +287,9 @@ class Process:
for f in self.write_fds: for f in self.write_fds:
f.write(data) f.write(data)
if self.verbose:
sys.__stdout__.write(data)
return True return True
def __del__(self): def __del__(self):