Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.29.1
rev: v2.31.0
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand Down
16 changes: 6 additions & 10 deletions testing/test_xfail_behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,12 @@ def test_xfail(is_crashing, is_strict, testdir):
session_start_title = "*==== test session starts ====*"
loaded_pytest_plugins = "plugins: forked*"
collected_tests_num = "collected 1 item"
expected_progress = "test_xfail.py {expected_letter!s}*".format(**locals())
expected_progress = f"test_xfail.py {expected_letter!s}*"
failures_title = "*==== FAILURES ====*"
failures_test_name = "*____ test_function ____*"
failures_test_reason = "[XPASS(strict)] The process gets terminated"
short_test_summary_title = "*==== short test summary info ====*"
short_test_summary = "{expected_word!s} test_xfail.py::test_function".format(
**locals()
)
short_test_summary = f"{expected_word!s} test_xfail.py::test_function"
if expected_lowercase == "xpassed":
# XPASS wouldn't have the crash message from
# pytest-forked because the crash doesn't happen
Expand All @@ -68,13 +66,11 @@ def test_xfail(is_crashing, is_strict, testdir):
)
)
reason_string = (
" reason: The process gets terminated; "
"pytest-forked reason: "
"*:*: running the test CRASHED with signal {sig_num:d}".format(**locals())
)
total_summary_line = "*==== 1 {expected_lowercase!s} in 0.*s* ====*".format(
**locals()
f" reason: The process gets terminated; "
f"pytest-forked reason: "
f"*:*: running the test CRASHED with signal {sig_num:d}"
)
total_summary_line = f"*==== 1 {expected_lowercase!s} in 0.*s* ====*"

expected_lines = (
session_start_title,
Expand Down