Skip to content

Commit

Permalink
Remove try_fix CLI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaReiser
MichaReiser committed Jan 4, 2025
1 parent 4366cdf commit a31d773
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 64 deletions.
114 changes: 114 additions & 0 deletions crates/ruff/tests/.integration_test.rs.pending-snap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{"run_id":"1735989123-420424000","line":2173,"new":{"module_name":"integration_test","snapshot_name":"no_verbose_hide_failed_fix_errors","metadata":{"source":"crates/ruff/tests/integration_test.rs","assertion_line":2173,"info":{"program":"ruff","args":["check","--no-cache","--isolated","-","--select","UP006","--preview"],"stdin":"import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."},"snapshot_kind":"text"},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nAll checks passed!\n\n----- stderr -----"},"old":{"module_name":"integration_test","metadata":{"snapshot_kind":"text"},"snapshot":"success: false\nexit_code: 1\n----- stdout -----\n-:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation\n |\n1 | import typing\n2 | Callable = 'abc'\n3 | def g() -> typing.Callable: ...\n | ^^^^^^^^^^^^^^^ UP006\n |\n = help: Replace with `collections.abc.Callable`\n\nFound 1 error.\n\n----- stderr -----"}}
{"run_id":"1735989123-420424000","line":1085,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":845,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":914,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":894,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1139,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1051,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1186,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1165,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1002,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1315,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1204,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1298,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1024,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":938,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1252,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1235,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1268,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1330,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1284,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":1222,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":137,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":955,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":113,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":978,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":625,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":290,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":309,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":816,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":652,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":668,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":796,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":489,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":257,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":603,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":99,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":232,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":2107,"new":null,"old":null}
{"run_id":"1735989123-420424000","line":2144,"new":{"module_name":"integration_test","snapshot_name":"verbose_show_failed_fix_errors","metadata":{"source":"crates/ruff/tests/integration_test.rs","assertion_line":2144,"info":{"program":"ruff","args":["check","--no-cache","--isolated","-","--select","UP006","--preview","-v"],"stdin":"import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."},"snapshot_kind":"text"},"snapshot":"success: true\nexit_code: 0\n----- stdout -----\nAll checks passed!\n\n----- stderr -----\n[ruff::resolve][DEBUG] Isolated mode, not reading any pyproject.toml"},"old":{"module_name":"integration_test","metadata":{"snapshot_kind":"text"},"snapshot":"success: false\nexit_code: 1\n----- stdout -----\n-:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation\n |\n1 | import typing\n2 | Callable = 'abc'\n3 | def g() -> typing.Callable: ...\n | ^^^^^^^^^^^^^^^ UP006\n |\n = help: Replace with `collections.abc.Callable`\n\nFound 1 error.\n\n----- stderr -----\n[ruff::resolve][DEBUG] Isolated mode, not reading any pyproject.toml\n[ruff_diagnostics::diagnostic][DEBUG] Failed to create fix for NonPEP585Annotation: Unable to insert `Callable` into scope due to name conflict"}}
{"run_id":"1735989123-420424000","line":1496,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1863,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":206,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1596,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1895,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1533,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":172,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1929,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1615,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1964,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1347,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1560,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1633,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":2016,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1577,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1435,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1418,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1383,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1652,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1689,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1671,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1364,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1401,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1707,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1819,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1835,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1778,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1798,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":2032,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1743,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":845,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":2067,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1760,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1725,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":865,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1068,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":914,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1118,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":894,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1102,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1085,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1051,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1139,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1024,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1186,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1165,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1315,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1002,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1204,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1235,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1330,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1298,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":938,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1252,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1284,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1268,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1222,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":955,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":652,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":137,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":625,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":113,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":309,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":978,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":668,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":603,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":816,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":796,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":290,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":489,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":257,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":99,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":232,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":2107,"new":null,"old":null}
{"run_id":"1735989285-843030000","line":1496,"new":null,"old":null}
64 changes: 0 additions & 64 deletions crates/ruff/tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2126,67 +2126,3 @@ unfixable = ["RUF"]

Ok(())
}

#[test]
fn verbose_show_failed_fix_errors() {
let mut cmd = RuffCheck::default()
.args(["--select", "UP006", "--preview", "-v"])
.build();

insta::with_settings!(
{
// the logs have timestamps we need to remove
filters => vec![(
r"\[[\d:-]+]",
""
)]
},{
assert_cmd_snapshot!(cmd
.pass_stdin("import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."),
@r###"
success: false
exit_code: 1
----- stdout -----
-:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation
|
1 | import typing
2 | Callable = 'abc'
3 | def g() -> typing.Callable: ...
| ^^^^^^^^^^^^^^^ UP006
|
= help: Replace with `collections.abc.Callable`
Found 1 error.
----- stderr -----
[ruff::resolve][DEBUG] Isolated mode, not reading any pyproject.toml
[ruff_diagnostics::diagnostic][DEBUG] Failed to create fix for NonPEP585Annotation: Unable to insert `Callable` into scope due to name conflict
"###); }
);
}

#[test]
fn no_verbose_hide_failed_fix_errors() {
let mut cmd = RuffCheck::default()
.args(["--select", "UP006", "--preview"])
.build();
assert_cmd_snapshot!(cmd
.pass_stdin("import typing\nCallable = 'abc'\ndef g() -> typing.Callable: ..."),
@r###"
success: false
exit_code: 1
----- stdout -----
-:3:12: UP006 Use `collections.abc.Callable` instead of `typing.Callable` for type annotation
|
1 | import typing
2 | Callable = 'abc'
3 | def g() -> typing.Callable: ...
| ^^^^^^^^^^^^^^^ UP006
|
= help: Replace with `collections.abc.Callable`
Found 1 error.
----- stderr -----
"###);
}

0 comments on commit a31d773

Please sign in to comment.