diff --git a/tests/integration.rs b/tests/integration.rs index 1c43736..fae4d1b 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -207,12 +207,12 @@ fn multiple_files_with_conflict_and_choce_to_overwrite( let before_dir = &before.join("dir"); fs::create_dir_all(before_dir).unwrap(); create_random_files(before_dir, depth, &mut SmallRng::from_entropy()); - + let after = &dir.join("after"); let after_dir = &after.join("dir"); fs::create_dir_all(after_dir).unwrap(); create_random_files(after_dir, depth, &mut SmallRng::from_entropy()); - + let archive = &dir.join(format!("archive.{}", merge_extensions(&ext, extra_extensions))); ouch!("-A", "c", before_dir, archive); @@ -242,11 +242,11 @@ fn multiple_files_with_conflict_and_choce_to_not_overwrite( let before_dir = &before.join("dir"); fs::create_dir_all(before_dir).unwrap(); create_random_files(before_dir, depth, &mut SmallRng::from_entropy()); - + let after = &dir.join("after"); let after_dir = &after.join("dir"); fs::create_dir_all(after_dir).unwrap(); - + let after_backup = &dir.join("after_backup"); let after_backup_dir = &after_backup.join("dir"); fs::create_dir_all(after_backup_dir).unwrap(); @@ -254,7 +254,7 @@ fn multiple_files_with_conflict_and_choce_to_not_overwrite( // Create a file with the same name as one of the files in the after directory fs::write(after_dir.join("something.txt"), "Some content").unwrap(); fs::copy(after_dir.join("something.txt"), after_backup_dir.join("something.txt")).unwrap(); - + let archive = &dir.join(format!("archive.{}", merge_extensions(&ext, extra_extensions))); ouch!("-A", "c", before_dir, archive); @@ -284,12 +284,12 @@ fn multiple_files_with_conflict_and_choce_to_rename( let before_dir = &before.join("dir"); fs::create_dir_all(before_dir).unwrap(); create_random_files(before_dir, depth, &mut SmallRng::from_entropy()); - + let after = &dir.join("after"); let after_dir = &after.join("dir"); fs::create_dir_all(after_dir).unwrap(); create_random_files(after_dir, depth, &mut SmallRng::from_entropy()); - + let archive = &dir.join(format!("archive.{}", merge_extensions(&ext, extra_extensions))); ouch!("-A", "c", before_dir, archive);