Fixed broken tests (#389)

rustyhorde · Dec 4, 2024 · e242196 · e242196
1 parent 063bd1f
commit e242196
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/vergen-git2/tests/git_output.rs b/vergen-git2/tests/git_output.rs
@@ -222,8 +222,10 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH";
     }
 
     #[cfg(any(target_os = "linux", target_os = "macos"))]
-    fn check_local_result(result: Result<bool>, _stdout_buf: &[u8]) {
-        assert!(result.is_err());
+    fn check_local_result(result: Result<bool>, stdout_buf: &[u8]) {
+        assert!(result.is_ok());
+        let output = String::from_utf8_lossy(stdout_buf);
+        assert!(GIT_REGEX_SHORT_INST.is_match(&output));
     }
 
     #[test]

diff --git a/vergen-gitcl/tests/git_output.rs b/vergen-gitcl/tests/git_output.rs
@@ -218,8 +218,10 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH";
     }
 
     #[cfg(any(target_os = "linux", target_os = "macos"))]
-    fn check_local_result(result: Result<bool>, _stdout_buf: &[u8]) {
-        assert!(result.is_err());
+    fn check_local_result(result: Result<bool>, stdout_buf: &[u8]) {
+        assert!(result.is_ok());
+        let output = String::from_utf8_lossy(stdout_buf);
+        assert!(GIT_REGEX_SHORT_INST.is_match(&output));
     }
 
     #[test]

diff --git a/vergen-gix/src/gix/mod.rs b/vergen-gix/src/gix/mod.rs
@@ -818,10 +818,13 @@ mod test {
             .commit_date(true)
             .use_local(true)
             .build()?;
-        assert!(Emitter::default()
+        let emitter = Emitter::default()
             .fail_on_error()
-            .add_instructions(&gix)
-            .is_err());
+            .add_instructions(&gix)?
+            .test_emit();
+        assert_eq!(1, emitter.cargo_rustc_env_map().len());
+        assert_eq!(0, count_idempotent(emitter.cargo_rustc_env_map()));
+        assert_eq!(0, emitter.cargo_warning().len());
         Ok(())
     }
 

diff --git a/vergen-gix/tests/git_output.rs b/vergen-gix/tests/git_output.rs
@@ -212,8 +212,10 @@ cargo:rerun-if-env-changed=SOURCE_DATE_EPOCH";
     }
 
     #[cfg(any(target_os = "linux", target_os = "macos"))]
-    fn check_local_result(result: Result<bool>, _stdout_buf: &[u8]) {
-        assert!(result.is_err());
+    fn check_local_result(result: Result<bool>, stdout_buf: &[u8]) {
+        assert!(result.is_ok());
+        let output = String::from_utf8_lossy(stdout_buf);
+        assert!(GIT_REGEX_SHORT_INST.is_match(&output));
     }
 
     #[test]

diff --git a/vergen/src/feature/build.rs b/vergen/src/feature/build.rs
@@ -396,8 +396,8 @@ mod test {
             .build()?;
         let emitter = Emitter::new().add_instructions(&build)?.test_emit();
         assert_eq!(1, emitter.cargo_rustc_env_map().len());
-        assert_eq!(1, count_idempotent(emitter.cargo_rustc_env_map()));
-        assert_eq!(1, emitter.cargo_warning().len());
+        assert_eq!(0, count_idempotent(emitter.cargo_rustc_env_map()));
+        assert_eq!(0, emitter.cargo_warning().len());
         Ok(())
     }
 
@@ -438,8 +438,8 @@ mod test {
             .build()?;
         let emitter = Emitter::new().add_instructions(&build)?.test_emit();
         assert_eq!(1, emitter.cargo_rustc_env_map().len());
-        assert_eq!(1, count_idempotent(emitter.cargo_rustc_env_map()));
-        assert_eq!(1, emitter.cargo_warning().len());
+        assert_eq!(0, count_idempotent(emitter.cargo_rustc_env_map()));
+        assert_eq!(0, emitter.cargo_warning().len());
         Ok(())
     }