|
2 | 2 | mod tests { |
3 | 3 | use duct::cmd; |
4 | 4 | use fs_err as fs; |
5 | | - use rattler_build::hash::HashInfo; |
6 | | - use rattler_conda_types::NoArchType; |
7 | 5 | use rattler_package_streaming::read::extract_tar_bz2; |
8 | 6 | use std::{ |
9 | | - collections::{BTreeMap, HashMap}, |
| 7 | + collections::HashMap, |
10 | 8 | ffi::{OsStr, OsString}, |
11 | 9 | fs::File, |
12 | 10 | path::{Component, Path, PathBuf}, |
@@ -310,12 +308,23 @@ mod tests { |
310 | 308 | assert!(rattler_build.status.success()); |
311 | 309 |
|
312 | 310 | let pkg = get_package(tmp.as_dir(), "pkg_hash".to_string()); |
313 | | - let mut variant = BTreeMap::new(); |
314 | | - variant.insert("target_platform".into(), host_subdir().into()); |
315 | | - let hash = HashInfo::from_variant(&variant, &NoArchType::none()); |
316 | | - let pkg_hash = "pkg_hash-1.0.0-h_my_pkg.tar.bz2"; |
| 311 | + let variant = [("target_platform", host_subdir())] |
| 312 | + .into_iter() |
| 313 | + .map(|(k, v)| (k.into(), v.into())) |
| 314 | + .collect::<std::collections::BTreeMap<_, _>>(); |
| 315 | + let hash = rattler_build::hash::HashInfo::from_variant( |
| 316 | + &variant, |
| 317 | + &rattler_conda_types::NoArchType::none(), |
| 318 | + ) |
| 319 | + .to_string(); |
| 320 | + let pkg_hash = format!("pkg_hash-1.0.0-{}.tar.bz2", hash); |
317 | 321 | let pkg = pkg.display().to_string(); |
318 | | - assert!(pkg.ends_with(&pkg_hash)); |
| 322 | + assert!( |
| 323 | + pkg.ends_with(&pkg_hash), |
| 324 | + "{} does not end with {}", |
| 325 | + pkg, |
| 326 | + pkg_hash |
| 327 | + ); |
319 | 328 | } |
320 | 329 |
|
321 | 330 | #[test] |
|
0 commit comments