itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test): Simplify handling of tar file prefixes

Browse Source
This commit is contained in:
Ed Page 2024-10-04 12:00:55 -05:00
parent 6d048153b3
commit 5c25f7a9b8
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
crates/cargo-test-support/src/publish.rs
View File

@ -184,29 +184,32 @@ pub fn validate_crate_contents(
let mut contents = Vec::new(); let mut contents = Vec::new();
rdr.read_to_end(&mut contents).unwrap(); rdr.read_to_end(&mut contents).unwrap();
let mut ar = Archive::new(&contents[..]); let mut ar = Archive::new(&contents[..]);
let files: HashMap<PathBuf, String> = ar
.entries()
.unwrap()
.map(|entry| {
let mut entry = entry.unwrap();
let name = entry.path().unwrap().into_owned();
let mut contents = String::new();
entry.read_to_string(&mut contents).unwrap();
(name, contents)
})
.collect();
let base_crate_name = Path::new( let base_crate_name = Path::new(
expected_crate_name expected_crate_name
.strip_suffix(".crate") .strip_suffix(".crate")
.expect("must end with .crate"), .expect("must end with .crate"),
); );
let actual_files: HashSet<PathBuf> = files.keys().cloned().collect(); let files: HashMap<PathBuf, String> = ar
let expected_files: HashSet<PathBuf> = expected_files .entries()
.iter() .unwrap()
.map(|name| base_crate_name.join(name)) .map(|entry| {
let mut entry = entry.unwrap();
let name = entry
.path()
.unwrap()
.strip_prefix(base_crate_name)
.unwrap()
.to_owned();
let mut contents = String::new();
entry.read_to_string(&mut contents).unwrap();
(name, contents)
})
.collect(); .collect();
let missing: Vec<&PathBuf> = expected_files.difference(&actual_files).collect(); let actual_files: HashSet<&Path> = files.keys().map(|p| p.as_path()).collect();
let extra: Vec<&PathBuf> = actual_files.difference(&expected_files).collect(); let expected_files: HashSet<&Path> =
expected_files.iter().map(|name| Path::new(name)).collect();
let missing: Vec<&&Path> = expected_files.difference(&actual_files).collect();
let extra: Vec<&&Path> = actual_files.difference(&expected_files).collect();
if !missing.is_empty() || !extra.is_empty() { if !missing.is_empty() || !extra.is_empty() {
panic!( panic!(
"uploaded archive does not match.\nMissing: {:?}\nExtra: {:?}\n", "uploaded archive does not match.\nMissing: {:?}\nExtra: {:?}\n",
@ -215,10 +218,10 @@ pub fn validate_crate_contents(
} }
if !expected_contents.is_empty() { if !expected_contents.is_empty() {
for (e_file_name, e_file_contents) in expected_contents { for (e_file_name, e_file_contents) in expected_contents {
let full_e_name = base_crate_name.join(e_file_name); let e_file_name = Path::new(e_file_name);
let actual_contents = files let actual_contents = files
.get(&full_e_name) .get(e_file_name)
.unwrap_or_else(|| panic!("file `{}` missing in archive", e_file_name)); .unwrap_or_else(|| panic!("file `{}` missing in archive", e_file_name.display()));
assert_match_exact(e_file_contents, actual_contents); assert_match_exact(e_file_contents, actual_contents);
} }
} }