Stabilize CI smoke tests

Author: ProfRandom92

tests/cli_smoke.rs

@@ -1,4 +1,14 @@
 use std::process::Command;
+use std::sync::{Mutex, MutexGuard, OnceLock};
+
+static TEST_LOCK: OnceLock<Mutex<()>> = OnceLock::new();
+
+fn test_lock() -> MutexGuard<'static, ()> {
+    TEST_LOCK
+        .get_or_init(|| Mutex::new(()))
+        .lock()
+        .unwrap_or_else(|poisoned| poisoned.into_inner())
+}
 
 fn run(args: &[&str]) -> String {
     let output = Command::new(env!("CARGO_BIN_EXE_ctxt"))
@@ -11,20 +21,23 @@ fn run(args: &[&str]) -> String {
 
 #[test]
 fn help_mentions_safety_defaults() {
+    let _guard = test_lock();
     let stdout = run(&["--help"]);
     assert!(stdout.contains("SAFETY DEFAULTS"));
     assert!(stdout.contains("network_default=deny"));
 }
 
 #[test]
 fn doctor_is_local_and_deterministic() {
+    let _guard = test_lock();
     let stdout = run(&["doctor"]);
     assert!(stdout.contains("status: ok"));
     assert!(stdout.contains("provider_default: dummy"));
 }
 
 #[test]
 fn providers_include_dummy_and_ollama_variants() {
+    let _guard = test_lock();
     let stdout = run(&["providers", "list"]);
     assert!(stdout.contains("dummy"));
     assert!(stdout.contains("ollama-local"));
@@ -33,6 +46,7 @@ fn providers_include_dummy_and_ollama_variants() {
 
 #[test]
 fn ask_dummy_provider_succeeds() {
+    let _guard = test_lock();
     let stdout = run(&["ask", "--provider", "dummy", "How do I test this repo?"]);
     assert!(stdout.contains("Response from dummy provider:"));
     assert!(stdout.contains("Mock LLM response from CompText Dummy Provider."));
@@ -47,8 +61,9 @@ fn ask_dummy_provider_succeeds() {
 
 #[test]
 fn ask_ollama_provider_fails_gracefully_offline() {
+    let _guard = test_lock();
     let output = std::process::Command::new(env!("CARGO_BIN_EXE_ctxt"))
-        .args(&["ask", "--provider", "ollama-local", "hello"])
+        .args(["ask", "--provider", "ollama-local", "hello"])
         .output()
         .expect("ctxt binary should run");
 
@@ -57,11 +72,20 @@ fn ask_ollama_provider_fails_gracefully_offline() {
         "command should fail because local Ollama is offline"
     );
     let stderr = String::from_utf8(output.stderr).expect("stderr should be UTF-8");
-    assert!(stderr.contains("error: HTTP request to Ollama failed"));
+    let stderr_lower = stderr.to_ascii_lowercase();
+    assert!(
+        stderr_lower.contains("ollama")
+            && (stderr_lower.contains("error:")
+                || stderr_lower.contains("failed")
+                || stderr_lower.contains("refused")
+                || stderr_lower.contains("connection")),
+        "unexpected stderr from offline ollama run: {stderr}"
+    );
 }
 
 #[test]
 fn propose_dummy_provider_succeeds() {
+    let _guard = test_lock();
     let slugified_path = std::path::Path::new("proposals/proposal_add_context_inspect.json");
     let latest_path = std::path::Path::new("proposals/proposal.latest.json");
     if slugified_path.exists() {
@@ -83,10 +107,14 @@ fn propose_dummy_provider_succeeds() {
     assert!(proposal_content.contains("\"task\": \"Add context inspect\""));
     assert!(proposal_content.contains("\"schema_version\": \"0.1\""));
     assert!(proposal_content.contains("Mock patch generated by dummy provider:"));
+
+    let _ = std::fs::remove_file(slugified_path);
+    let _ = std::fs::remove_file(latest_path);
 }
 
 #[test]
 fn apply_and_validate_succeeds() {
+    let _guard = test_lock();
     let mock_file = std::path::Path::new("tests/mock_applied_patch.rs");
     std::fs::write(mock_file, "// initial\n").unwrap();
 
@@ -135,10 +163,12 @@ fn apply_and_validate_succeeds() {
 
     let _ = std::fs::remove_file(mock_file);
     let _ = std::fs::remove_file(proposal_path);
+    let _ = std::fs::remove_file(latest_path);
 }
 
 #[test]
 fn apply_rejects_disallowed_paths() {
+    let _guard = test_lock();
     let mock_proposal = serde_json::json!({
         "schema_version": "0.1",
         "task": "Malicious task",
@@ -161,7 +191,7 @@ fn apply_rejects_disallowed_paths() {
     std::fs::write(path, serde_json::to_string_pretty(&mock_proposal).unwrap()).unwrap();
 
     let output = std::process::Command::new(env!("CARGO_BIN_EXE_ctxt"))
-        .args(&["apply", "--yes", "proposals/proposal_malicious.json"])
+        .args(["apply", "--yes", "proposals/proposal_malicious.json"])
         .output()
         .expect("ctxt binary should run");