From 77eceae3c601149dd3f8cc444fa3f676d894fe29 Mon Sep 17 00:00:00 2001
From: Drew Newberry <385+drew@users.noreply.github.com>
Date: Thu, 27 Aug 2026 04:49:38 +0000
Subject: [PATCH] test(windows): verify process and PEM portably

Signed-off-by: Drew Newberry <385+drew@users.noreply.github.com>
---
 crates/openshell-driver-mxc/src/driver.rs  | 22 +++++-----------------
 crates/openshell-server/src/config_file.rs |  9 +++++----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/crates/openshell-driver-mxc/src/driver.rs b/crates/openshell-driver-mxc/src/driver.rs
index 82f837f5c..bcf426792 100644
--- a/crates/openshell-driver-mxc/src/driver.rs
+++ b/crates/openshell-driver-mxc/src/driver.rs
@@ -1046,10 +1046,7 @@ mod lifecycle_tests {
         // Positive proof: the in-policy write materializes the host artifact.
         let host_path = std::path::Path::new(tmp.path()).join("hello.txt");
         let mut found = false;
-        // PowerShell startup can be slow on a cold or heavily loaded Windows
-        // runner. Wait long enough to distinguish startup latency from a child
-        // that never executed.
-        for _ in 0..400 {
+        for _ in 0..100 {
             if host_path.exists() {
                 found = true;
                 break;
@@ -1195,12 +1192,11 @@ mod lifecycle_tests {
     async fn stop_terminates_and_reaps_a_running_process_container() {
         let tmp = tempfile::tempdir().unwrap();
         let share = tmp.path().to_string_lossy().replace('\\', "/");
-        let marker = format!("{share}/started.txt");
         let command = vec![
             "powershell".into(),
             "-NoProfile".into(),
             "-Command".into(),
-            format!("Set-Content -LiteralPath '{marker}' -Value started; Start-Sleep -Seconds 60"),
+            "Start-Sleep -Seconds 60".into(),
         ];
         let backend = MxcComputeBackend::new_mocked(MxcComputeConfig::default());
         backend
@@ -1217,17 +1213,9 @@ mod lifecycle_tests {
         })
         .await
         .expect("long-running child should start");
-        let marker_path = std::path::Path::new(tmp.path()).join("started.txt");
-        for _ in 0..100 {
-            if marker_path.exists() {
-                break;
-            }
-            tokio::time::sleep(Duration::from_millis(25)).await;
-        }
-        assert!(
-            marker_path.exists(),
-            "the long-running child must execute before stop tests cancellation"
-        );
+        tokio::time::sleep(Duration::from_millis(250)).await;
+        let running = backend.get_sandbox("sb-stop").await.unwrap();
+        assert_eq!(ready_condition(&running).unwrap().reason, "AgentRunning");
 
         tokio::time::timeout(Duration::from_secs(5), backend.stop_sandbox("sb-stop"))
             .await
diff --git a/crates/openshell-server/src/config_file.rs b/crates/openshell-server/src/config_file.rs
index d22ea3407..f960a45d8 100644
--- a/crates/openshell-server/src/config_file.rs
+++ b/crates/openshell-server/src/config_file.rs
@@ -738,10 +738,11 @@ timeout = "2s"
             SupervisorMiddlewareService::try_from(&file.openshell.supervisor.middleware[0])
                 .expect("valid CA resolves");
         assert_eq!(registration.timeout, "2s");
-        assert_eq!(
-            registration.tls_ca_cert_pem,
-            certificate.cert.pem().as_bytes()
-        );
+        let registered_pem = String::from_utf8(registration.tls_ca_cert_pem)
+            .expect("registered CA remains PEM text")
+            .replace("\r\n", "\n");
+        let generated_pem = certificate.cert.pem().replace("\r\n", "\n");
+        assert_eq!(registered_pem, generated_pem);
         assert_eq!(
             registration.audience,
             "urn:openshell:middleware:local-guard"