test-runner: fix --monitor option
PATCH 1/2 test-runner: fix --monitor option
Two issues:
- log-gid/uid was not being set
- the log file was being appended if it already existed
--- tools/test-runner | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tools/test-runner +8 -3
@@ -183,7 +183,9 @@ class Process(subprocess.Popen): args = ['ip', 'netns', 'exec', namespace] + args 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: logfile = '%s/%s/%s' % (self.ctx.args.log,
@@ -240,7 +242,7 @@ class Process(subprocess.Popen): return True - def _append_outfile(self, file): + def _append_outfile(self, file, append=True): gid = int(self.ctx.args.log_gid) uid = int(self.ctx.args.log_uid) dir = os.path.dirname(file)
@@ -253,7 +255,7 @@ class Process(subprocess.Popen): # If the out file exists, append. Useful for processes like # hostapd_cli where it is called multiple times independently. - if os.path.isfile(file): + if os.path.isfile(file) and append: mode = 'a' else: mode = 'w'
@@ -1708,6 +1710,9 @@ class Main: self.args.monitor = os.path.abspath(self.args.monitor) 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 = [ 'auto_tests', 'sub_tests',
Signature · 1 line
2.31.1
PATCH 2/2 station: check for duplicate frequencies in debug scan
--- src/station.c | 3 +++ 1 file changed, 3 insertions(+)
src/station.c +3 -0
@@ -3980,6 +3980,9 @@ static struct l_dbus_message *station_debug_scan(struct l_dbus *dbus, freq_set =scan_freq_set_new ();for (i =0 ; i < freqs_len; i++) { +if (scan_freq_set_contains (freq_set, (uint32_t )freqs[i])) +continue ; +if (!scan_freq_set_add (freq_set, (uint32_t )freqs[i])) {scan_freq_set_free (freq_set); goto invalid_args;
Signature · 1 line
2.31.1
Hi James,
Quoted 7 lines · James Prestwood
Two issues:
- log-gid/uid was not being set
- the log file was being appended if it already existed--- tools/test-runner | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Both applied, thanks.
Regards,
-Denis