test: serialize test execution to prevent non-deterministic failures due to expectation overrides

Author: krishnakumar4a4

crates/cargo-wdk/src/actions/build/package_task.rs

@@ -677,6 +677,7 @@ mod tests {
         os::windows::process::ExitStatusExt,
         path::PathBuf,
         process::{ExitStatus, Output},
+        sync::Mutex,
     };
 
     use mockall::predicate::eq;
@@ -690,6 +691,14 @@ mod tests {
         wdk_build::MockWdkBuild,
     };
 
+    // Serializes test execution within this module. The
+    // `stampinf_version_overrides_with_env_var` test mutates the
+    // `STAMPINF_VERSION` env var via `with_env`, which is process-global state.
+    // Other tests that call `run_stampinf()` read the same env var, so parallel
+    // execution causes non-deterministic failures when the env var is
+    // unexpectedly set.
+    static TEST_MUTEX: Mutex<()> = Mutex::new(());
+
     #[test]
     fn new_succeeds_for_valid_args() {
         let package_name = "test_package";
@@ -816,6 +825,7 @@ mod tests {
 
     #[test]
     fn run_packages_driver_with_expected_operations() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
 
@@ -866,6 +876,7 @@ mod tests {
 
     #[test]
     fn run_verifies_signatures_when_enabled() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new().with_sign_mode(SignMode::Test {
             verify_signature: true,
         });
@@ -887,6 +898,7 @@ mod tests {
 
     #[test]
     fn run_exports_certificate_from_store_when_it_already_exists() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
 
@@ -935,6 +947,7 @@ mod tests {
 
     #[test]
     fn run_returns_error_when_inx_file_is_missing() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
         harness.expect_exists(paths.src_inx_file_path.clone(), false);
@@ -951,6 +964,7 @@ mod tests {
 
     #[test]
     fn run_returns_error_when_copying_driver_binary_fails() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
 
@@ -985,6 +999,7 @@ mod tests {
 
     #[test]
     fn run_returns_error_when_stampinf_fails() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
 
@@ -1022,6 +1037,7 @@ mod tests {
 
     #[test]
     fn run_returns_error_when_inf2cat_fails() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new();
         let paths = harness.paths();
 
@@ -1060,6 +1076,7 @@ mod tests {
 
     #[test]
     fn run_skips_infverif_for_samples_when_wdk_build_is_in_bugged_range() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         let mut harness = PackageTaskHarness::new().with_sample_class(true);
         let paths = harness.paths();
 
@@ -1109,6 +1126,7 @@ mod tests {
 
     #[test]
     fn stampinf_version_overrides_with_env_var() {
+        let _lock = TEST_MUTEX.lock().unwrap();
         // verify both with and without the env var set scenarios
         let scenarios = [
             ("env_set", Some("1.2.3.4"), true),

crates/cargo-wdk/src/actions/build/tests.rs

@@ -857,15 +857,23 @@ impl TestBuildAction {
             CpuArchitecture::Amd64 => "x86_64",
             CpuArchitecture::Arm64 => "aarch64",
         };
+        let mut expected_args: Vec<String> = vec!["rustc".to_string()];
+        if self.locked {
+            expected_args.push("--locked".to_string());
+        }
+        expected_args.extend(super::features_to_cargo_args(&self.features));
+        expected_args.extend(["--".to_string(), "--print".to_string(), "cfg".to_string()]);
         self.mock_run_command
             .expect_run()
             .withf(
                 move |command: &str,
                       args: &[&str],
                       _env_vars: &Option<&HashMap<&str, &str>>,
                       working_dir: &Option<&Path>| {
+                    let expected_refs: Vec<&str> =
+                        expected_args.iter().map(String::as_str).collect();
                     command == "cargo"
-                        && args == ["rustc", "--", "--print", "cfg"]
+                        && args == expected_refs.as_slice()
                         && working_dir.is_some_and(|dir| dir == expected_working_dir.as_path())
                 },
             )
@@ -1484,6 +1492,14 @@ mod get_target_arch_from_cargo_rustc {
         cwd: PathBuf,
         stdout: Vec<u8>,
     ) {
+        let mut expected_args: Vec<String> = vec!["rustc".to_string()];
+        if test_build_action.locked {
+            expected_args.push("--locked".to_string());
+        }
+        expected_args.extend(super::super::features_to_cargo_args(
+            &test_build_action.features,
+        ));
+        expected_args.extend(["--".to_string(), "--print".to_string(), "cfg".to_string()]);
         test_build_action
             .mock_run_command
             .expect_run()
@@ -1492,8 +1508,10 @@ mod get_target_arch_from_cargo_rustc {
                       args: &[&str],
                       _env_vars: &Option<&HashMap<&str, &str>>,
                       working_dir: &Option<&Path>| {
+                    let expected_refs: Vec<&str> =
+                        expected_args.iter().map(String::as_str).collect();
                     command == "cargo"
-                        && args == ["rustc", "--", "--print", "cfg"]
+                        && args == expected_refs.as_slice()
                         && matches!(working_dir, Some(dir) if *dir == cwd.as_path())
                 },
             )