user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1180 - RalfJung:fs-refact, r=RalfJung

Browse source 
Slight refactoring of FS test
This commit is contained in:
bors 2020-02-19 10:17:32 +00:00
commit 62bc08af18
1 changed files with 31 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

84
tests/run-pass/fs.rs
View file

@ -15,13 +15,26 @@ fn main() {
test_rename();
}
fn test_file() {
/// Prepare: compute filename and make sure the file does not exist.
fn prepare(filename: &str) -> PathBuf {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_file.txt");
let path = tmp.join(&filename);
let bytes = b"Hello, World!\n";
let path = tmp.join(filename);
// Clean the paths for robustness.
remove_file(&path).ok();
path
}
/// Prepare like above, and also write some initial content to the file.
fn prepare_with_content(filename: &str, content: &[u8]) -> PathBuf {
let path = prepare(filename);
let mut file = File::create(&path).unwrap();
file.write(content).unwrap();
path
}
fn test_file() {
let bytes = b"Hello, World!\n";
let path = prepare("miri_test_fs_file.txt");
// Test creating, writing and closing a file (closing is tested when `file` is dropped).
let mut file = File::create(&path).unwrap();
@ -45,15 +58,8 @@ fn test_file() {
}
fn test_file_clone() {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_file_clone.txt");
let path = tmp.join(&filename);
let bytes = b"Hello, World!\n";
// Clean the paths for robustness.
remove_file(&path).ok();
let mut file = File::create(&path).unwrap();
file.write(bytes).unwrap();
let path = prepare_with_content("miri_test_fs_file_clone.txt", bytes);
// Cloning a file should be successful.
let file = File::open(&path).unwrap();
@ -68,19 +74,13 @@ fn test_file_clone() {
}
fn test_seek() {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_seek.txt");
let path = tmp.join(&filename);
let bytes = b"Hello, World!\n";
// Clean the paths for robustness.
remove_file(&path).ok();
let mut file = File::create(&path).unwrap();
file.write(bytes).unwrap();
let bytes = b"Hello, entire World!\n";
let path = prepare_with_content("miri_test_fs_seek.txt", bytes);
let mut file = File::open(&path).unwrap();
let mut contents = Vec::new();
file.read_to_end(&mut contents).unwrap();
assert_eq!(bytes, contents.as_slice());
// Test that seeking to the beginning and reading until EOF gets the text again.
file.seek(SeekFrom::Start(0)).unwrap();
let mut contents = Vec::new();
@ -113,38 +113,23 @@ fn check_metadata(bytes: &[u8], path: &Path) -> Result<()> {
}
fn test_metadata() {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_metadata.txt");
let path = tmp.join(&filename);
let bytes = b"Hello, World!\n";
// Clean the paths for robustness.
remove_file(&path).ok();
let mut file = File::create(&path).unwrap();
file.write(bytes).unwrap();
let bytes = b"Hello, meta-World!\n";
let path = prepare_with_content("miri_test_fs_metadata.txt", bytes);
// Test that metadata of an absolute path is correct.
check_metadata(bytes, &path).unwrap();
// Test that metadata of a relative path is correct.
std::env::set_current_dir(&tmp).unwrap();
check_metadata(bytes, &filename).unwrap();
std::env::set_current_dir(path.parent().unwrap()).unwrap();
check_metadata(bytes, Path::new(path.file_name().unwrap())).unwrap();
// Removing file should succeed.
remove_file(&path).unwrap();
}
fn test_symlink() {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_link_target.txt");
let path = tmp.join(&filename);
let symlink_path = tmp.join("miri_test_fs_symlink.txt");
let bytes = b"Hello, World!\n";
// Clean the paths for robustness.
remove_file(&path).ok();
remove_file(&symlink_path).ok();
let mut file = File::create(&path).unwrap();
file.write(bytes).unwrap();
let path = prepare_with_content("miri_test_fs_link_target.txt", bytes);
let symlink_path = prepare("miri_test_fs_symlink.txt");
// Creating a symbolic link should succeed.
std::os::unix::fs::symlink(&path, &symlink_path).unwrap();
@ -165,12 +150,8 @@ fn test_symlink() {
}
fn test_errors() {
let tmp = std::env::temp_dir();
let filename = PathBuf::from("miri_test_fs_errors.txt");
let path = tmp.join(&filename);
let bytes = b"Hello, World!\n";
// Clean the paths for robustness.
remove_file(&path).ok();
let path = prepare("miri_test_fs_errors.txt");
// The following tests also check that the `__errno_location()` shim is working properly.
// Opening a non-existing file should fail with a "not found" error.
@ -182,13 +163,10 @@ fn test_errors() {
}
fn test_rename() {
let tmp = std::env::temp_dir();
// Renaming a file should succeed.
let path1 = tmp.join("miri_test_fs_rename_source.txt");
let path2 = tmp.join("miri_test_fs_rename_destination.txt");
// Clean files for robustness.
remove_file(&path1).ok();
remove_file(&path2).ok();
let path1 = prepare("miri_test_fs_rename_source.txt");
let path2 = prepare("miri_test_fs_rename_destination.txt");
let file = File::create(&path1).unwrap();
drop(file);
rename(&path1, &path2).unwrap();