Skip to content

Commit ebb484a

Browse files
MichaReiserMichaReiser
committed
Add OsSystem support to mdtests
1 parent d11b254 commit ebb484a

File tree

30 files changed

+499
-202
lines changed

30 files changed

+499
-202
lines changed

‎Cargo.lock‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/red_knot_project/src/files.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ mod tests {
255255
use crate::files::Index;
256256
use crate::ProjectMetadata;
257257
use ruff_db::files::system_path_to_file;
258-
use ruff_db::system::{DbWithTestSystem, SystemPathBuf};
258+
use ruff_db::system::{DbWithWritableSystem as _, SystemPathBuf};
259259
use ruff_python_ast::name::Name;
260260

261261
#[test]

‎crates/red_knot_project/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ mod tests {
527527
use ruff_db::diagnostic::Diagnostic;
528528
use ruff_db::files::system_path_to_file;
529529
use ruff_db::source::source_text;
530-
use ruff_db::system::{DbWithTestSystem, SystemPath, SystemPathBuf};
530+
use ruff_db::system::{DbWithTestSystem, DbWithWritableSystem as _, SystemPath, SystemPathBuf};
531531
use ruff_db::testing::assert_function_query_was_not_run;
532532
use ruff_python_ast::name::Name;
533533

‎crates/red_knot_project/src/metadata.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ mod tests {
321321

322322
system
323323
.memory_file_system()
324-
.write_files([(root.join("foo.py"), ""), (root.join("bar.py"), "")])
324+
.write_files_all([(root.join("foo.py"), ""), (root.join("bar.py"), "")])
325325
.context("Failed to write files")?;
326326

327327
let project =
@@ -349,7 +349,7 @@ mod tests {
349349

350350
system
351351
.memory_file_system()
352-
.write_files([
352+
.write_files_all([
353353
(
354354
root.join("pyproject.toml"),
355355
r#"
@@ -393,7 +393,7 @@ mod tests {
393393

394394
system
395395
.memory_file_system()
396-
.write_files([
396+
.write_files_all([
397397
(
398398
root.join("pyproject.toml"),
399399
r#"
@@ -432,7 +432,7 @@ expected `.`, `]`
432432

433433
system
434434
.memory_file_system()
435-
.write_files([
435+
.write_files_all([
436436
(
437437
root.join("pyproject.toml"),
438438
r#"
@@ -482,7 +482,7 @@ expected `.`, `]`
482482

483483
system
484484
.memory_file_system()
485-
.write_files([
485+
.write_files_all([
486486
(
487487
root.join("pyproject.toml"),
488488
r#"
@@ -532,7 +532,7 @@ expected `.`, `]`
532532

533533
system
534534
.memory_file_system()
535-
.write_files([
535+
.write_files_all([
536536
(
537537
root.join("pyproject.toml"),
538538
r#"
@@ -572,7 +572,7 @@ expected `.`, `]`
572572

573573
system
574574
.memory_file_system()
575-
.write_files([
575+
.write_files_all([
576576
(
577577
root.join("pyproject.toml"),
578578
r#"
@@ -623,7 +623,7 @@ expected `.`, `]`
623623

624624
system
625625
.memory_file_system()
626-
.write_files([
626+
.write_files_all([
627627
(
628628
root.join("pyproject.toml"),
629629
r#"
@@ -673,7 +673,7 @@ expected `.`, `]`
673673

674674
system
675675
.memory_file_system()
676-
.write_file(
676+
.write_file_all(
677677
root.join("pyproject.toml"),
678678
r#"
679679
[project]
@@ -703,7 +703,7 @@ expected `.`, `]`
703703

704704
system
705705
.memory_file_system()
706-
.write_file(
706+
.write_file_all(
707707
root.join("pyproject.toml"),
708708
r#"
709709
[project]
@@ -735,7 +735,7 @@ expected `.`, `]`
735735

736736
system
737737
.memory_file_system()
738-
.write_file(
738+
.write_file_all(
739739
root.join("pyproject.toml"),
740740
r#"
741741
[project]
@@ -765,7 +765,7 @@ expected `.`, `]`
765765

766766
system
767767
.memory_file_system()
768-
.write_file(
768+
.write_file_all(
769769
root.join("pyproject.toml"),
770770
r#"
771771
[project]
@@ -795,7 +795,7 @@ expected `.`, `]`
795795

796796
system
797797
.memory_file_system()
798-
.write_file(
798+
.write_file_all(
799799
root.join("pyproject.toml"),
800800
r#"
801801
[project]
@@ -828,7 +828,7 @@ expected `.`, `]`
828828

829829
system
830830
.memory_file_system()
831-
.write_file(
831+
.write_file_all(
832832
root.join("pyproject.toml"),
833833
r#"
834834
[project]
@@ -861,7 +861,7 @@ expected `.`, `]`
861861

862862
system
863863
.memory_file_system()
864-
.write_file(
864+
.write_file_all(
865865
root.join("pyproject.toml"),
866866
r#"
867867
[project]
@@ -886,7 +886,7 @@ expected `.`, `]`
886886

887887
system
888888
.memory_file_system()
889-
.write_file(
889+
.write_file_all(
890890
root.join("pyproject.toml"),
891891
r#"
892892
[project]
@@ -911,7 +911,7 @@ expected `.`, `]`
911911

912912
system
913913
.memory_file_system()
914-
.write_file(
914+
.write_file_all(
915915
root.join("pyproject.toml"),
916916
r#"
917917
[project]

‎crates/red_knot_project/tests/check.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn run_corpus_tests(pattern: &str) -> anyhow::Result<()> {
117117
let code = std::fs::read_to_string(source)?;
118118

119119
let mut check_with_file_name = |path: &SystemPath| {
120-
memory_fs.write_file(path, &code).unwrap();
120+
memory_fs.write_file_all(path, &code).unwrap();
121121
File::sync_path(&mut db, path);
122122

123123
// this test is only asserting that we can pull every expression type without a panic

‎crates/red_knot_python_semantic/resources/mdtest/import/case_sensitive.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Case Sensitive Imports
22

3-
TODO: This test should use the real file system instead of the memory file system.
3+
4+
```toml
5+
# TODO: This test should use the real file system instead of the memory file system.
6+
# but we can't change the file system yet because the tests would then start failing for
7+
# case-insensitive file systems.
8+
# file_system = "os"
9+
```
410

511
Python's import system is case-sensitive even on case-insensitive file system. This means, importing
612
a module `a` should fail if the file in the search paths is named `A.py`. See

‎crates/red_knot_python_semantic/src/db.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ pub(crate) mod tests {
2525
use crate::lint::{LintRegistry, RuleSelection};
2626
use anyhow::Context;
2727
use ruff_db::files::{File, Files};
28-
use ruff_db::system::{DbWithTestSystem, System, SystemPathBuf, TestSystem};
28+
use ruff_db::system::{
29+
DbWithTestSystem, DbWithWritableSystem, System, SystemPathBuf, TestSystem,
30+
};
2931
use ruff_db::vendored::VendoredFileSystem;
3032
use ruff_db::{Db as SourceDb, Upcast};
3133
use ruff_python_ast::PythonVersion;

‎crates/red_knot_python_semantic/src/module_resolver/resolver.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ impl<'db> ResolverContext<'db> {
720720
#[cfg(test)]
721721
mod tests {
722722
use ruff_db::files::{system_path_to_file, File, FilePath};
723-
use ruff_db::system::DbWithTestSystem;
723+
use ruff_db::system::{DbWithTestSystem as _, DbWithWritableSystem as _};
724724
use ruff_db::testing::{
725725
assert_const_function_query_was_not_run, assert_function_query_was_not_run,
726726
};

‎crates/red_knot_python_semantic/src/module_resolver/testing.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ruff_db::system::{DbWithTestSystem, SystemPath, SystemPathBuf};
1+
use ruff_db::system::{DbWithTestSystem, DbWithWritableSystem, SystemPath, SystemPathBuf};
22
use ruff_db::vendored::VendoredPathBuf;
33
use ruff_python_ast::PythonVersion;
44

‎crates/red_knot_python_semantic/src/semantic_index.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ impl FusedIterator for ChildrenIter<'_> {}
409409
mod tests {
410410
use ruff_db::files::{system_path_to_file, File};
411411
use ruff_db::parsed::parsed_module;
412-
use ruff_db::system::DbWithTestSystem;
412+
use ruff_db::system::DbWithWritableSystem as _;
413413
use ruff_python_ast as ast;
414414
use ruff_text_size::{Ranged, TextRange};
415415

@@ -440,7 +440,7 @@ mod tests {
440440
file: File,
441441
}
442442

443-
fn test_case(content: impl ToString) -> TestCase {
443+
fn test_case(content: impl AsRef<str>) -> TestCase {
444444
let mut db = TestDb::new();
445445
db.write_file("test.py", content).unwrap();
446446

0 commit comments

Comments
 (0)