fix tests

Author: dylan-hurd-oai

codex-rs/core/src/environment_context.rs

@@ -227,20 +227,21 @@ impl From<EnvironmentContext> for ResponseItem {
 // Restrict Operating System Info to Windows and Linux inside WSL for now
 #[cfg(target_os = "windows")]
 fn operating_system_info_impl() -> Option<OperatingSystemInfo> {
-    let os_info = os_info::get();
+    let info = os_info::get();
     Some(OperatingSystemInfo {
-        name: os_info.os_type().to_string(),
-        version: os_info.version().to_string(),
+        name: info.os_type().to_string(),
+        version: info.version().to_string(),
         is_likely_windows_subsystem_for_linux: Some(has_wsl_env_markers()),
     })
 }
 
 #[cfg(all(unix, not(target_os = "macos")))]
 fn operating_system_info_impl() -> Option<OperatingSystemInfo> {
+    let info = os_info::get();
     match has_wsl_env_markers() {
         true => Some(OperatingSystemInfo {
-            name: "Windows Subsystem for Linux".to_string(),
-            version: "".to_string(),
+            name: info.os_type().to_string(),
+            version: info.version().to_string(),
             is_likely_windows_subsystem_for_linux: Some(true),
         }),
         false => None,
@@ -307,10 +308,11 @@ mod tests {
     #[test]
     fn operating_system_info_matches_wsl_detection_on_unix() {
         let info = operating_system_info_impl();
+        let os_details = os_info::get();
         if has_wsl_env_markers() {
             let info = info.expect("expected WSL operating system info");
-            assert_eq!(info.name, "Windows Subsystem for Linux");
-            assert_eq!(info.version, "");
+            assert_eq!(info.name, os_details.os_type().to_string());
+            assert_eq!(info.version, os_details.version().to_string());
             assert_eq!(info.is_likely_windows_subsystem_for_linux, Some(true));
         } else {
             assert_eq!(info, None);

codex-rs/core/tests/suite/prompt_caching.rs

@@ -50,17 +50,18 @@ fn operating_system_context_block() -> String {
         let name = info.os_type().to_string();
         let version = info.version().to_string();
         let is_wsl = has_wsl_env_markers();
-        return format!(
+        format!(
             "  <operating_system>\n    <name>{name}</name>\n    <version>{version}</version>\n    <is_likely_windows_subsystem_for_linux>{is_wsl}</is_likely_windows_subsystem_for_linux>\n  </operating_system>\n"
-        );
+        )
     }
 
     #[cfg(all(unix, not(target_os = "macos")))]
     {
         if has_wsl_env_markers() {
-            return "  <operating_system>\n    <name>Windows Subsystem for Linux</name>\n    <version></version>\n    <is_likely_windows_subsystem_for_linux>true</is_likely_windows_subsystem_for_linux>\n  </operating_system>\n".to_string();
+            "  <operating_system>\n    <name>{name}</name>\n    <version></version>\n    <is_likely_windows_subsystem_for_linux>true</is_likely_windows_subsystem_for_linux>\n  </operating_system>\n".to_string()
+        } else {
+            String::new()
         }
-        return String::new();
     }
 
     #[cfg(target_os = "macos")]
@@ -374,22 +375,10 @@ async fn prefixes_context_and_instructions_once_and_consistently_across_requests
 
     let shell = default_user_shell().await;
 
-    let expected_env_text = format!(
-        r#"<environment_context>
-  <cwd>{}</cwd>
-  <approval_policy>on-request</approval_policy>
-  <sandbox_mode>read-only</sandbox_mode>
-  <network_access>restricted</network_access>
-{}</environment_context>"#,
-        cwd.path().to_string_lossy(),
-        match shell.name() {
-            Some(name) => format!("  <shell>{name}</shell>\n"),
-            None => String::new(),
-        }
-    );
+    let cwd_str = cwd.path().to_string_lossy().into_owned();
+    let expected_env_text = default_env_context_str(&cwd_str, &shell);
     let expected_ui_text = format!(
-        "# AGENTS.md instructions for {}\n\n<INSTRUCTIONS>\nbe consistent and helpful\n</INSTRUCTIONS>",
-        cwd.path().to_string_lossy()
+        "# AGENTS.md instructions for {cwd_str}\n\n<INSTRUCTIONS>\nbe consistent and helpful\n</INSTRUCTIONS>"
     );
 
     let expected_env_msg = serde_json::json!({