Simplify flake8_pytest_style::rules::fail_call implementation (#14556)
Some checks are pending
CI / Determine changes (push) Waiting to run
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Blocked by required conditions
CI / cargo build (msrv) (push) Blocked by required conditions
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / benchmarks (push) Blocked by required conditions

This commit is contained in:
Harutaka Kawamura 2024-11-23 23:14:28 +09:00 committed by GitHub
parent 07d13c6b4a
commit 1f303a5eb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -59,18 +59,12 @@ pub(crate) fn fail_call(checker: &mut Checker, call: &ast::ExprCall) {
if is_pytest_fail(&call.func, checker.semantic()) {
// Allow either `pytest.fail(reason="...")` (introduced in pytest 7.0) or
// `pytest.fail(msg="...")` (deprecated in pytest 7.0)
let msg = call
if call
.arguments
.find_argument("reason", 0)
.or_else(|| call.arguments.find_argument("msg", 0));
if let Some(msg) = msg {
if is_empty_or_null_string(msg) {
checker
.diagnostics
.push(Diagnostic::new(PytestFailWithoutMessage, call.func.range()));
}
} else {
.or_else(|| call.arguments.find_argument("msg", 0))
.map_or(true, is_empty_or_null_string)
{
checker
.diagnostics
.push(Diagnostic::new(PytestFailWithoutMessage, call.func.range()));