redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-04-21 20:27:46 +00:00
Code Activity

Fix some bad patch tests

Browse source
This commit is contained in:
Joshua Goins 2025-03-06 15:56:46 -05:00
parent 18de50f365
commit 75443bf7be
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/patch.rs
View file

@ -807,10 +807,12 @@ mod tests {
let data_dir = prepare_data_dir(); let data_dir = prepare_data_dir();
write(data_dir.clone() + "/test.patch", &read(d).unwrap()); write(data_dir.clone() + "/test.patch", &read(d).unwrap()).unwrap();
// Feeding it invalid data should not panic // Feeding it invalid data should not panic
ZiPatch::apply(&data_dir.clone(), &(data_dir + "/test.patch")); let Err(PatchError::ParseError) = ZiPatch::apply(&data_dir.clone(), &(data_dir + "/test.patch")) else {
panic!("Expecting a parse error!");
};
} }
#[test] #[test]
@ -827,26 +829,22 @@ mod tests {
// Let's create a patch that re-creates the resources dir into our data directory // Let's create a patch that re-creates the resources dir into our data directory
let patch = ZiPatch::create(&*data_dir, resources_dir.to_str().unwrap()).unwrap(); let patch = ZiPatch::create(&*data_dir, resources_dir.to_str().unwrap()).unwrap();
write(data_dir.clone() + "/test.patch", &patch); write(data_dir.clone() + "/test.patch", &patch).unwrap();
ZiPatch::apply(&data_dir.clone(), &(data_dir.clone() + "/test.patch")); ZiPatch::apply(&data_dir.clone(), &(data_dir.clone() + "/test.patch")).unwrap();
// FIXME: For some reason, running this test by itself is fine. However when running in the test suite, it trips over itself. fs::remove_file(data_dir.clone() + "/test.patch").unwrap();
// So this is a really cruddy way to wait for the files to settle.
sleep(Duration::new(1, 0));
fs::remove_file(data_dir.clone() + "/test.patch");
let old_files = recurse(&resources_dir); let old_files = recurse(&resources_dir);
let new_files = recurse(&data_dir); let new_files = recurse(&data_dir);
let old_relative_files: Vec<&Path> = old_files.iter().filter(|item| { let mut old_relative_files: Vec<&Path> = old_files.iter().filter(|item| {
let metadata = fs::metadata(item).unwrap(); let metadata = fs::metadata(item).unwrap();
metadata.len() > 0 // fitler out zero byte files because ZiPatch::create does metadata.len() > 0 // filter out zero byte files because ZiPatch::create does
}).map(|x| x.strip_prefix(&resources_dir).unwrap()).collect(); }).map(|x| x.strip_prefix(&resources_dir).unwrap()).collect();
let new_relative_files: Vec<&Path> = new_files.iter().map(|x| x.strip_prefix(&data_dir).unwrap()).collect(); let mut new_relative_files: Vec<&Path> = new_files.iter().map(|x| x.strip_prefix(&data_dir).unwrap()).collect();
assert_eq!(old_relative_files, new_relative_files); assert_eq!(old_relative_files.sort(), new_relative_files.sort());
} }
} }