add more tests

Author: Qelxiros

library/std/src/fs/tests.rs

@@ -18,7 +18,7 @@ use crate::char::MAX_LEN_UTF8;
     target_vendor = "apple",
 ))]
 use crate::fs::TryLockError;
-use crate::fs::{self, File, FileTimes, OpenOptions, create_dir};
+use crate::fs::{self, File, FileTimes, OpenOptions, create_dir, exists};
 use crate::io::prelude::*;
 use crate::io::{BorrowedBuf, ErrorKind, SeekFrom};
 use crate::mem::MaybeUninit;
@@ -2131,13 +2131,7 @@ fn test_dir_remove_file() {
     drop(f);
     let dir = check!(Dir::new(tmpdir.path()));
     check!(dir.remove_file("foo.txt"));
-    let result = File::open(tmpdir.join("foo.txt"));
-    #[cfg(all(unix, not(target_os = "vxworks")))]
-    error!(result, "No such file or directory");
-    #[cfg(target_os = "vxworks")]
-    error!(result, "no such file or directory");
-    #[cfg(windows)]
-    error!(result, 2); // ERROR_FILE_NOT_FOUND
+    assert!(!matches!(exists(tmpdir.join("foo.txt")), Ok(true)));
 }
 
 #[test]
@@ -2146,13 +2140,7 @@ fn test_dir_remove_dir() {
     check!(create_dir(tmpdir.join("foo")));
     let dir = check!(Dir::new(tmpdir.path()));
     check!(dir.remove_dir("foo"));
-    let result = Dir::new(tmpdir.join("foo"));
-    #[cfg(all(unix, not(target_os = "vxworks")))]
-    error!(result, "No such file or directory");
-    #[cfg(target_os = "vxworks")]
-    error!(result, "no such file or directory");
-    #[cfg(windows)]
-    error!(result, 2); // ERROR_FILE_NOT_FOUND
+    assert!(!matches!(exists(tmpdir.join("foo")), Ok(true)));
 }
 
 #[test]
@@ -2177,3 +2165,39 @@ fn test_dir_create_dir() {
     check!(dir.create_dir("foo"));
     check!(Dir::new(tmpdir.join("foo")));
 }
+
+#[test]
+fn test_dir_open_dir() {
+    let tmpdir = tmpdir();
+    let dir1 = check!(Dir::new(tmpdir.path()));
+    check!(dir1.create_dir("foo"));
+    let dir2 = check!(Dir::new(tmpdir.path().join("foo")));
+    let mut f = check!(dir2.open_with("bar.txt", &OpenOptions::new().create(true).write(true)));
+    check!(f.write(b"baz"));
+    check!(f.flush());
+    drop(f);
+    let dir3 = check!(dir1.open_dir("foo"));
+    let mut f = check!(dir3.open("bar.txt"));
+    let mut buf = [0u8; 3];
+    check!(f.read_exact(&mut buf));
+    assert_eq!(b"baz", &buf);
+}
+
+#[test]
+fn test_dir_symlink() {
+    let tmpdir = tmpdir();
+    if !got_symlink_permission(&tmpdir) {
+        return;
+    };
+
+    let dir = check!(Dir::new(tmpdir.path()));
+    let mut f = check!(dir.open_with("foo.txt", &OpenOptions::new().write(true).create(true)));
+    check!(f.write(b"quux"));
+    check!(f.flush());
+    drop(f);
+    check!(dir.symlink("foo.txt", "bar.txt"));
+    let mut f = check!(dir.open("bar.txt"));
+    let mut buf = [0u8; 4];
+    check!(f.read_exact(&mut buf));
+    assert_eq!(b"quux", &buf);
+}

library/std/src/sys/fs/unix.rs

@@ -374,7 +374,9 @@ impl Dir {
     }
 
     pub fn open_dir<P: AsRef<Path>>(&self, path: P) -> io::Result<Self> {
-        run_path_with_cstr(path.as_ref(), &|path| self.open_c_dir(path, &OpenOptions::new()))
+        let mut opts = OpenOptions::new();
+        opts.read(true);
+        run_path_with_cstr(path.as_ref(), &|path| self.open_c_dir(path, &opts))
     }
 
     pub fn open_dir_with<P: AsRef<Path>>(&self, path: P, opts: &OpenOptions) -> io::Result<Self> {