Refactor Rust lint test structure to use RuffTestFixture #20689

Renkai · 2025-10-03T00:58:06Z

Part of: #19016, for lint.rs

github-actions · 2025-10-03T01:06:16Z

`ruff-ecosystem` results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

Formatter (stable)

✅ ecosystem check detected no format changes.

Formatter (preview)

✅ ecosystem check detected no format changes.

- Keep insta::with_settings filters as they are still needed - The filters replace temporary directory paths in warning messages - All refactored functions now pass: top_level_options, lint_options, mixed_levels, precedence

You were correct - RuffTestFixture functions don't need the tempdir filters because the warning messages show clean filenames (ruff.toml) rather than full temporary directory paths. - Removed insta::with_settings! wrappers - Use raw assert_cmd_snapshot! calls - Removed unused tempdir_filter import - All tests pass: top_level_options, lint_options, mixed_levels, precedence

MichaReiser · 2025-10-03T06:04:07Z

Thanks for working on this. Yes, this is what I had in mind.

…uffTestFixture - exclude: Uses RuffTestFixture.new() and write_file() for multiple files - deduplicate_directory_and_explicit_file: Simple refactoring with write_file() - Both functions now use clean assert_cmd_snapshot! calls without filters - Tests pass with identical behavior

…stFixture - exclude_stdin: Uses RuffTestFixture.with_file() for stdin-based testing - line_too_long_width_override: Another stdin-based function refactoring - Both functions now use clean assert_cmd_snapshot! calls without filters - Tests pass with identical behavior after snapshot updates

Renkai · 2025-10-04T03:21:23Z

Hi @MichaReiser , not sure why I can't modify the reviewers label, PTAL

Renkai · 2025-10-04T03:24:00Z

Can't help on modify the windows insta snapshots very well, because I don't own a windows computer

Refactor tempdir_filter to use strip_prefix for UNC paths

Renkai · 2025-10-05T01:16:36Z

Can't help on modify the windows insta snapshots very well, because I don't own a windows computer

You can edit snapshots by hand. It's a bit pain but it should be okay if it's only that / is replaced with TMP/.

For the other changes. It looks like there's a missing filter somewhere where the base path isn't filtered out anymore.

I fixed the filter problem, but for some tests, windows and linux have different behavior, the linux tests expect ruff.toml but windows expect [TMP]/ruff.toml. I doubt the fs::relativize_path method does not work well in some cases for windows.

https://github.com/Renkai/ruff/blob/2d3458f242188f9a3cdda46ada0aefacafd7f406/crates/ruff_workspace/src/configuration.rs#L1605

Renkai · 2025-10-05T01:50:23Z

In the new pattern, there are four functions have different behavior between windows and linux

line_too_long_width_override
mixed_levels
precedence
top_level_options
I reverted them to the main branch version. It's most likely caused by fs::relativize_path can't work well in some cases, I recommend to create a new issue for them.

MichaReiser

Nice. This is great. I only have a few questions around using dunce/dedent

MichaReiser · 2025-10-06T07:45:32Z

crates/ruff/tests/test_fixture.rs

+//! The core concept is borrowed from ty/tests/cli/main.rs and can be extended
+//! with more functionality from there in the future if needed.
+
+#![allow(dead_code)]


Let's remove the allow dead code and remove any unusede code instead

The current functions are actually all used, not sure why the clippy believe they are dead, add some unit tests to make sure they are used now.

MichaReiser · 2025-10-06T07:46:38Z

crates/ruff/tests/test_fixture.rs

+    let normalized_path = if let Some(stripped) = path_str.strip_prefix(r"\\?\") {
+        stripped
+    } else {
+        path_str
+    };


What's the reason why you aren't using dunce here (you can add it as a dev-only dependency)

Nice crate, I didn't know it exists before.

MichaReiser · 2025-10-06T07:47:51Z

crates/ruff/tests/cli/main.rs

+    // Always add optional UNC prefix to match both \\?\C:\... and C:\... patterns
+    // This ensures compatibility regardless of whether input or output contains UNC prefix


Rather than handling UNC paths here, I suggest to do the same as ty and strip any UNC prefix in new

MichaReiser · 2025-10-06T07:48:11Z

crates/ruff/tests/test_fixture.rs

+        let project_dir = temp_dir
+            .path()
+            .canonicalize()
+            .context("Failed to canonicalize project path")?;


Let's strip the UNC prefix here using dunce (you can add it as a dev dependency)

MichaReiser · 2025-10-06T07:48:58Z

crates/ruff/tests/test_fixture.rs

+
+        Self::ensure_parent_directory(&file_path)?;
+
+        let content = content.trim_start_matches('\n');


Can we use dedent here instead of trimming start new lines only?

github-actions · 2025-10-07T00:08:30Z

Diagnostic diff on typing conformance tests

No changes detected when running ty on typing conformance tests ✅

github-actions · 2025-10-07T00:09:40Z

`mypy_primer` results

No ecosystem changes detected ✅
No memory usage changes detected ✅

Renkai added 2 commits October 3, 2025 08:46

Extract test fixture utilities into test_fixture.rs

31f9b51

Update lint.rs

704b968

Renkai mentioned this pull request Oct 3, 2025

Cleanup Ruff's CLI tests #19016

Open

Renkai added 4 commits October 3, 2025 09:17

Clarify filter usage in RuffTestFixture refactoring

fb96418

- Keep insta::with_settings filters as they are still needed - The filters replace temporary directory paths in warning messages - All refactored functions now pass: top_level_options, lint_options, mixed_levels, precedence

Update lint.rs

4fe2f5d

Update lint.rs

b332224

Renkai added 18 commits October 4, 2025 09:08

Update lint.rs

7ce6805

Update lint.rs

3e42271

Update lint.rs

783f2ae

Update lint.rs

8295b62

Update lint.rs

c720128

Update lint.rs

4cabba0

Update lint.rs

9f25722

Merge remote-tracking branch 'origin/main' into renkai19016

0d1f4da

Update lint.rs

28cd685

Update lint.rs

a7505de

Update lint.rs

aeb687d

Update lint.rs

7c91b73

Update lint.rs

d5b9fb7

Replace <temp_dir>/ with [TMP]/ in test output filters and snapshots

9997e78

clippy

c483050

temdir filter for windows

aae62a1

Renkai marked this pull request as ready for review October 4, 2025 03:14

Renkai added 4 commits October 5, 2025 08:37

Update lint.rs

11a793f

Normalize Windows UNC paths in tempdir_filter

8559f3a

Remove debug eprintlns from requires_python_ruff_toml_no_target_fallback

c4893e6

Refactor tempdir_filter to use strip_prefix for UNC paths

Update test_fixture.rs

2d3458f

Renkai added 2 commits October 5, 2025 09:21

Merge branch 'main' into renkai19016

1d59ff8

Update lint.rs

9207bba

MichaReiser reviewed Oct 6, 2025

View reviewed changes

Renkai added 4 commits October 7, 2025 07:45

Update test_fixture.rs

6212cee

Normalize tempdir paths using dunce in test_fixture

e39283c

Update test_fixture.rs

5f73273

Add ruff_python_trivia dependency and use dedent in tests

e9eccb5

Renkai added 2 commits October 7, 2025 08:10

Remove redundant path normalization in tempdir_filter

f63a3c7

Update test error messages to reflect correct TOML line numbers

b3dd973

Renkai requested a review from MichaReiser October 7, 2025 00:32

Introduce cli module to avoid dead code warning

336133b

MichaReiser force-pushed the renkai19016 branch from 8438e78 to 336133b Compare October 7, 2025 06:17

Simplify tempdir filter

4543c25

MichaReiser added the testing Related to testing Ruff itself label Oct 7, 2025

MichaReiser added 6 commits October 7, 2025 08:55

Move some snapshots back (thanks claude...")

fe3fa8c

Revert some test changes

b39d281

More helpers, filter file URLs

f8af807

Try again

8e73232

Fix windows snapshot errors

2fb4768

Remove dbg

7dc3b26

MichaReiser merged commit 76f8e5b into astral-sh:main Oct 7, 2025
38 checks passed

MichaReiser mentioned this pull request Oct 7, 2025

Move --show-settings snapshots to separate files #20741

Merged

		// Always add optional UNC prefix to match both \\?\C:\... and C:\... patterns
		// This ensures compatibility regardless of whether input or output contains UNC prefix


		Self::ensure_parent_directory(&file_path)?;

		let content = content.trim_start_matches('\n');

Refactor Rust lint test structure to use RuffTestFixture #20689

Refactor Rust lint test structure to use RuffTestFixture #20689

Uh oh!

Conversation

Renkai commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Formatter (stable)

Formatter (preview)

Uh oh!

MichaReiser commented Oct 3, 2025

Uh oh!

Renkai commented Oct 4, 2025

Uh oh!

Renkai commented Oct 4, 2025

Uh oh!

Renkai commented Oct 5, 2025

Uh oh!

Renkai commented Oct 5, 2025

Uh oh!

MichaReiser left a comment

Choose a reason for hiding this comment

Uh oh!

MichaReiser Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

Renkai Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

Renkai Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

MichaReiser Oct 6, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Diagnostic diff on typing conformance tests

Uh oh!

github-actions bot commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

mypy_primer results

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Renkai commented Oct 3, 2025 •

edited

Loading

github-actions bot commented Oct 3, 2025 •

edited

Loading

`ruff-ecosystem` results

github-actions bot commented Oct 7, 2025 •

edited

Loading

github-actions bot commented Oct 7, 2025 •

edited

Loading

`mypy_primer` results