Fix -vv overriding --durations-min (#12938)
#13100
Conversation
psf-chronographer
bot
added
the
bot:chronographer:provided
JulianJvn
force-pushed
the
durations-min-precedence
branch
from
7e06d44 to
7e5c1b6
Compare
|
|
||
| tested = "3" | ||
| for x in tested: | ||
| for y in ("call",): # 'setup', 'call', 'teardown': |
There was a problem hiding this comment.
Not sure what the rationale for this comment is. It was added with --durations in 3b9fd3a, 13 years ago. I removed it.
|
|
||
| for x in "123": | ||
| for y in ("call",): # 'setup', 'call', 'teardown': |
There was a problem hiding this comment.
Looking for "call" is not sufficient, as the output in question contains test_calls_showall_verbose.py::test_X PASSED (e.g.) for all test numbers X, which contains call as well, even though the call might be missing in the durations list. Added a space before and after call to fix this.
| tested = "3" | ||
| for x in tested: |
There was a problem hiding this comment.
This only checks whether test 3 is in the output, but not if the other tests are not. Fixed this.
| break | ||
| else: | ||
| raise AssertionError(f"not found {x} {y}") | ||
| def test_calls_showall_durationsmin(self, pytester: Pytester, mock_timing) -> None: |
There was a problem hiding this comment.
A test for --durations-min was missing. Added one.
| assert result.ret == 0 | ||
| TestDurations.check_tests_in_output(result.stdout.lines, "3") | ||
|
|
||
| def test_calls_showall_durationsmin_verbose( |
There was a problem hiding this comment.
This is the actual test that fails without the change in src/_pytest/runner.py.
| TestDurations.check_tests_in_output(result.stdout.lines, "3") | ||
|
|
||
| @staticmethod | ||
| def check_tests_in_output(lines: Sequence[str], expected_test_numbers: str) -> None: |
There was a problem hiding this comment.
Reduced code duplication by refactoring common code into a separate function.
There was a problem hiding this comment.
I'd prefer to take expected_test_numbers: Collection[int], or better yet *expected_test_numbers: int, then check for more than just 1/2/3 in the condition below, and finally assert a comparison between eg lists.
JulianJvn
force-pushed
the
durations-min-precedence
branch
from
d8ccca7 to
a811765
Compare
| TestDurations.check_tests_in_output(result.stdout.lines, "3") | ||
|
|
||
| @staticmethod | ||
| def check_tests_in_output(lines: Sequence[str], expected_test_numbers: str) -> None: |
There was a problem hiding this comment.
I'd prefer to take expected_test_numbers: Collection[int], or better yet *expected_test_numbers: int, then check for more than just 1/2/3 in the condition below, and finally assert a comparison between eg lists.
Fix
--durations-minargument not respected if-vvis used.Fixes #12938.