selftests: net: ksft: print more of the stack for checks
Subsystems (3)
Jakub Kicinski
maintainerPATCH v2 1/1 selftests: net: ksft: print more of the stack for checks
Print more stack frames and the failing line when check fails. This helps when tests use helpers to do the checks.
Before:
# At ./ksft/drivers/net/hw/rss_ctx.py line 92:
# Check failed 1037698 >= 396893.0 traffic on other queues:[344612, 462380, 233020, 449174, 342298] not ok 8 rss_ctx.test_rss_context_queue_reconfigure
After:
# Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 387, in test_rss_context_queue_reconfigure:
# Check| test_rss_queue_reconfigure(cfg, main_ctx=False)
# Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 230, in test_rss_queue_reconfigure:
# Check| _send_traffic_check(cfg, port, ctx_ref, { 'target': (0, 3),
# Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 92, in _send_traffic_check:
# Check| ksft_lt(sum(cnts[i] for i in params['noise']), directed / 2,# Check failed 1045235 >= 405823.5 traffic on other queues (context 1)':[460068, 351995, 565970, 351579, 127270] not ok 8 rss_ctx.test_rss_context_queue_reconfigure
---
v2:
- use Stan's iteration suggestion
v1: https://lore.kernel.org/all/[email protected]/
--- tools/testing/selftests/net/lib/py/ksft.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
tools/testing/selftests/net/lib/py/ksft.py +9 -2
@@ -32,8 +32,15 @@ KSFT_RESULT_ALL = True global KSFT_RESULT KSFT_RESULT = False - frame = inspect.stack()[2] - ksft_pr("At " + frame.filename + " line " + str(frame.lineno) + ":") + stack = inspect.stack() + started = False + for frame in reversed(stack[2:]): + if not started: + started |= frame.function == 'ksft_run' + continue + ksft_pr("Check| At " + frame.filename + ", line " + str(frame.lineno) + + ", in " + frame.function + ":") + ksft_pr("Check| " + frame.code_context[0].strip()) ksft_pr(*args)
Signature · 1 line
2.45.2
Quoted 17 lines · Jakub Kicinski
Print more stack frames and the failing line when check fails. This helps when tests use helpers to do the checks.
Before:
# At
./ksft/drivers/net/hw/rss_ctx.pyline 92:
# Check failed 1037698 >= 396893.0 traffic on other queues:[344612, 462380, 233020, 449174, 342298] not ok 8 rss_ctx.test_rss_context_queue_reconfigureAfter:
# Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 387, in test_rss_context_queue_reconfigure: # Check| test_rss_queue_reconfigure(cfg, main_ctx=False) # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 230, in test_rss_queue_reconfigure: # Check| _send_traffic_check(cfg, port, ctx_ref, { 'target': (0, 3), # Check| At ./ksft/drivers/net/hw/rss_ctx.py, line 92, in _send_traffic_check: # Check| ksft_lt(sum(cnts[i] for i in params['noise']), directed / 2,
Quoted 4 lines
# Check failed 1045235 >= 405823.5 traffic on other queues (context 1)':[460068, 351995, 565970, 351579, 127270] not ok 8 rss_ctx.test_rss_context_queue_reconfigure
Signed-off-by Jakub Kicinski <[email protected]>
Quoted 5 lines
tools/testing/selftests/net/lib/py/ksft.py +0
-0
tools/testing/selftests/net/lib/py/ksft.py KSFT_RESULT_ALL = True · line 39
Quoted 10 lines
tools/testing/selftests/net/lib/py/ksft.py +5
-2@@ -32,8 +32,15 @@ KSFT_RESULT_ALL = True global KSFT_RESULT KSFT_RESULT = False - frame = inspect.stack()[2] - ksft_pr("At " + frame.filename + " line " + str(frame.lineno) + ":") + stack = inspect.stack() + started = False + for frame in reversed(stack[2:]): + if not started: + started |= frame.function == 'ksft_run'
Hmm, using bitwise operations on booleans is somewhat unusual in Python I think, especially if here the short-circuiting of "or" wouldn't be a problem. But it doesn't degrade to integers so I guess it's well-defined.
Quoted 5 lines
tools/testing/selftests/net/lib/py/ksft.py +4
-0+ continue + ksft_pr("Check| At " + frame.filename + ", line " + str(frame.lineno) + + ", in " + frame.function + ":") + ksft_pr("Check| " + frame.code_context[0].strip()) ksft_pr(*args)
Jakub Kicinski
maintainerQuoted 5 lines · On Wed, 31 Jul 2024 13:07:26 +0200 Petr Machata wrote:
Quoted 1 line
+ started |= frame.function == '
ksft_run'Hmm, using bitwise operations on booleans is somewhat unusual in Python I think, especially if here the short-circuiting of "or" wouldn't be a problem. But it doesn't degrade to integers so I guess it's well-defined.
Right, I thought the automatic conversions to booleans are sometimes considered in poor taste in Python, but wasn't aware that bitwise ops may be frowned upon. IIUC the alternative would be:
if frame.function == 'ksft_run': started = True
or
started = started or frame.function == 'ksft_run'
or another way?
Quoted 10 lines · Jakub Kicinski
Quoted 5 lines · On Wed, 31 Jul 2024 13:07:26 +0200 Petr Machata wrote:
Quoted 1 line
+ started |= frame.function == '
ksft_run'Hmm, using bitwise operations on booleans is somewhat unusual in Python I think, especially if here the short-circuiting of "or" wouldn't be a problem. But it doesn't degrade to integers so I guess it's well-defined.
Right, I thought the automatic conversions to booleans are sometimes considered in poor taste in Python, but wasn't aware that bitwise ops may be frowned upon. IIUC the alternative would be:
FWIW I checked with a proper Pythonist in the meantime, and it's not just me :)
Also, it's not bitwise ops per se. When doing bit twiddling on integrals it would be totally legit. It's the part where we are dealing with booleans that makes it unfashionable.
Quoted 7 lines
if frame.function == 'ksft_run': started = Trueor
started = started or frame.function == 'ksft_run'
I'd prefer the former.