bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

clean up remove-dir-all-race rmake test

Browse source 
- removes unused variables
- fixes a few typos
This commit is contained in:
Rémy Rakic 2024-12-23 09:26:57 +00:00
parent d6a9ad6190
commit 1d77a2c677
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/run-make/remove-dir-all-race/rmake.rs
View file

@ -1,13 +1,13 @@
//@ ignore-windows //@ ignore-windows
// This test attempts to make sure that running `remove_dir_all` // This test attempts to make sure that running `remove_dir_all`
// doesn't result in a NotFound error one of the files it // doesn't result in a NotFound error if one of the files it
// is deleting is deleted concurrently. // is deleting is deleted concurrently.
// //
// The windows implementation for `remove_dir_all` is significantly // The windows implementation for `remove_dir_all` is significantly
// more complicated, and has not yet been brought up to par with // more complicated, and has not yet been brought up to par with
// the implementation on other platforms, so this test is marked as // the implementation on other platforms, so this test is marked as
// `ignore-windows` until someone more expirenced with windows can // `ignore-windows` until someone more experienced with windows can
// sort that out. // sort that out.
use std::fs::remove_dir_all; use std::fs::remove_dir_all;
@ -27,13 +27,12 @@ fn main() {
write("outer/inner.txt", b"sometext"); write("outer/inner.txt", b"sometext");
thread::scope(|scope| { thread::scope(|scope| {
let t1 = scope.spawn(|| { scope.spawn(|| {
thread::sleep(Duration::from_nanos(i)); thread::sleep(Duration::from_nanos(i));
remove_dir_all("outer").unwrap(); remove_dir_all("outer").unwrap();
}); });
let race_happened_ref = &race_happened; scope.spawn(|| {
let t2 = scope.spawn(|| {
let r1 = remove_dir_all("outer/inner"); let r1 = remove_dir_all("outer/inner");
let r2 = remove_dir_all("outer/inner.txt"); let r2 = remove_dir_all("outer/inner.txt");
if r1.is_ok() && r2.is_err() { if r1.is_ok() && r2.is_err() {
@ -44,10 +43,10 @@ fn main() {
assert!(!Path::new("outer").exists()); assert!(!Path::new("outer").exists());
// trying to remove a nonexistant top-level directory should // trying to remove a nonexistent top-level directory should
// still result in an error. // still result in an error.
let Err(err) = remove_dir_all("outer") else { let Err(err) = remove_dir_all("outer") else {
panic!("removing nonexistant dir did not result in an error"); panic!("removing nonexistent dir did not result in an error");
}; };
assert_eq!(err.kind(), std::io::ErrorKind::NotFound); assert_eq!(err.kind(), std::io::ErrorKind::NotFound);
} }