Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'selftests-net-fix-cmd-process-timeout-handling'
Gal Pressman says:
====================
selftests: net: fix cmd.process() timeout handling
Pass the timeout argument correctly in cmd.process().
As Jakub noted, fixing the timeout broke the bpftrace() command
in netpoll_basic.py, so fix it first.
====================
Link: https://patch.msgid.link/20260310115803.2521050-1-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+3
-2
+3
-2
tools/testing/selftests/net/lib/py/utils.py
+3
-2
tools/testing/selftests/net/lib/py/utils.py
···
93
93
def _process_terminate(self, terminate, timeout):
94
94
if terminate:
95
95
self.proc.terminate()
96
-
stdout, stderr = self.proc.communicate(timeout)
96
+
stdout, stderr = self.proc.communicate(timeout=timeout)
97
97
self.stdout = stdout.decode("utf-8")
98
98
self.stderr = stderr.decode("utf-8")
99
99
self.proc.stdout.close()
···
258
258
cmd_arr += ['-f', 'json', '-q']
259
259
if timeout:
260
260
expr += ' interval:s:' + str(timeout) + ' { exit(); }'
261
+
timeout += 5
261
262
cmd_arr += ['-e', expr]
262
-
cmd_obj = cmd(cmd_arr, ns=ns, host=host, shell=False)
263
+
cmd_obj = cmd(cmd_arr, ns=ns, host=host, shell=False, timeout=timeout)
263
264
if json:
264
265
# bpftrace prints objects as lines
265
266
ret = {}