.

Author: zelosleone

rust-tests/src/lib.rs

@@ -300,6 +300,14 @@ mod tests {
         extract_path
     }
 
+    fn variant_hash(src: String) -> String {
+        use sha1::Digest;
+        let mut hasher = sha1::Sha1::new();
+        hasher.update(src);
+        let hash = hasher.finalize();
+        format!("h{hash:x}")[..8].to_string()
+    }
+
     #[test]
     fn test_pkg_hash() {
         let tmp = tmp("test_pkg_hash");
@@ -308,23 +316,11 @@ mod tests {
         assert!(rattler_build.status.success());
 
         let pkg = get_package(tmp.as_dir(), "pkg_hash".to_string());
-        let variant = [("target_platform", host_subdir())]
-            .into_iter()
-            .map(|(k, v)| (k.into(), v.into()))
-            .collect::<std::collections::BTreeMap<_, _>>();
-        let hash = rattler_build::hash::HashInfo::from_variant(
-            &variant,
-            &rattler_conda_types::NoArchType::none(),
-        )
-        .to_string();
-        let pkg_hash = format!("pkg_hash-1.0.0-{}_my_pkg.tar.bz2", hash);
+        // yes this was broken because in rust default formatting for map does include that one space in the middle!
+        let expected_hash = variant_hash(format!("{{\"target_platform\": \"{}\"}}", host_subdir()));
+        let pkg_hash = format!("pkg_hash-1.0.0-{expected_hash}_my_pkg.tar.bz2");
         let pkg = pkg.display().to_string();
-        assert!(
-            pkg.ends_with(&pkg_hash),
-            "{} does not end with {}",
-            pkg,
-            pkg_hash
-        );
+        assert!(pkg.ends_with(&pkg_hash));
     }
 
     #[test]
@@ -654,15 +650,10 @@ package:
   version: 1.0.0
 build:
   script:
-    content: |
-      echo "Testing Python installation"
-      python --version
-      python --help
+    content: ${{ PYTHON }} --help
 requirements:
   host:
     - python
-  build:
-    - python
 "#;
         run_build_from_yaml_string(recipe_content.to_string());
     }
@@ -677,7 +668,7 @@ package:
 build:
   script:
     content:
-      - python --help
+      - ${{ PYTHON }} --help
 requirements:
   host:
     - python