Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

test-runner: fix --monitor option

Browse Source 
Two issues:
 - log-gid/uid was not being set
 - the log file was being appended if it already existed
This commit is contained in:
James Prestwood 2021-09-01 16:38:51 -07:00 committed by Denis Kenzior
parent 735dc0b7f3
commit 1b44527511
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/test-runner
View File

@ -183,7 +183,9 @@ class Process(subprocess.Popen):
args = ['ip', 'netns', 'exec', namespace] + args args = ['ip', 'netns', 'exec', namespace] + args
if outfile: if outfile:
self._append_outfile(outfile) # outfile is only used by iwmon, in which case we don't want
# to append to an existing file.
self._append_outfile(outfile, append=False)
if self.ctx.args.log: if self.ctx.args.log:
logfile = '%s/%s/%s' % (self.ctx.args.log, logfile = '%s/%s/%s' % (self.ctx.args.log,
@ -240,7 +242,7 @@ class Process(subprocess.Popen):
return True return True
def _append_outfile(self, file): def _append_outfile(self, file, append=True):
gid = int(self.ctx.args.log_gid) gid = int(self.ctx.args.log_gid)
uid = int(self.ctx.args.log_uid) uid = int(self.ctx.args.log_uid)
dir = os.path.dirname(file) dir = os.path.dirname(file)
@ -253,7 +255,7 @@ class Process(subprocess.Popen):
# If the out file exists, append. Useful for processes like # If the out file exists, append. Useful for processes like
# hostapd_cli where it is called multiple times independently. # hostapd_cli where it is called multiple times independently.
if os.path.isfile(file): if os.path.isfile(file) and append:
mode = 'a' mode = 'a'
else: else:
mode = 'w' mode = 'w'
@ -1708,6 +1710,9 @@ class Main:
self.args.monitor = os.path.abspath(self.args.monitor) self.args.monitor = os.path.abspath(self.args.monitor)
mon_parent_dir = os.path.abspath(os.path.join(self.args.monitor, os.pardir)) mon_parent_dir = os.path.abspath(os.path.join(self.args.monitor, os.pardir))
options += ' --log-gid %u' % int(os.environ['SUDO_GID'])
options += ' --log-uid %u' % int(os.environ['SUDO_UID'])
denylist = [ denylist = [
'auto_tests', 'auto_tests',
'sub_tests', 'sub_tests',