test(process): isolate timeout cleanup timing from compilation

Author: fffonion

tests/rss_process_tool_tests.rs

@@ -403,7 +403,26 @@ fn default_artifact_limits() -> ArtifactLimits {
     }
 }
 
+fn compile_exec_runner(exec: &RssExec) -> AgentRunner {
+    if exec.unlimited_fuel {
+        compile_rss_with_fuel(exec.module, None)
+    } else {
+        compile_rss(exec.module)
+    }
+}
+
 fn run_rss_exec(fixture: &Fixture, config: &ProcessToolConfig, exec: RssExec) -> RssRun {
+    let runner = compile_exec_runner(&exec);
+    run_rss_exec_with_runner(fixture, config, exec, runner, None)
+}
+
+fn run_rss_exec_with_runner(
+    fixture: &Fixture,
+    config: &ProcessToolConfig,
+    exec: RssExec,
+    runner: AgentRunner,
+    process_spawn_hook: Option<Arc<dyn Fn() + Send + Sync>>,
+) -> RssRun {
     let lifecycle = match exec.shared_lifecycle.clone() {
         Some(lifecycle) => lifecycle,
         None => Arc::new(build_lifecycle(
@@ -422,6 +441,9 @@ fn run_rss_exec(fixture: &Fixture, config: &ProcessToolConfig, exec: RssExec) ->
                 .expect("process capability"),
         ),
     };
+    if let Some(hook) = process_spawn_hook {
+        processes.set_before_os_spawn_hook(hook);
+    }
     let artifacts = if exec.enable_artifacts {
         Some(Arc::new(
             ArtifactCapability::new(lifecycle.as_ref().clone(), owner(), exec.artifact_limits)
@@ -453,11 +475,6 @@ fn run_rss_exec(fixture: &Fixture, config: &ProcessToolConfig, exec: RssExec) ->
         },
         "config": rss_config_json(config),
     });
-    let runner = if exec.unlimited_fuel {
-        compile_rss_with_fuel(exec.module, None)
-    } else {
-        compile_rss(exec.module)
-    };
     let output = runner
         .with_host(host)
         .run_with_context(json_to_vm_value(&context))
@@ -1077,15 +1094,29 @@ fn foreground_timeout_kills_child_and_grandchild() {
         ],
         "timeout_ms": 120
     });
-    let started = Instant::now();
-    let rss = run_rss_exec(
+    let spawn_started_at = Arc::new(Mutex::new(None));
+    let exec = default_exec("terminal.rss", "terminal", arguments);
+    let runner = compile_exec_runner(&exec);
+    let rss = run_rss_exec_with_runner(
         &fixture,
         &config,
-        default_exec("terminal.rss", "terminal", arguments),
+        exec,
+        runner,
+        Some({
+            let spawn_started_at = Arc::clone(&spawn_started_at);
+            Arc::new(move || {
+                *spawn_started_at.lock().expect("spawn timer") = Some(Instant::now());
+            })
+        }),
     );
     assert_eq!(rss.result["ok"], json!(false));
     assert_eq!(rss.result["error"]["code"], json!("deadline_elapsed"));
     assert_canonical_envelope(&rss.result);
+    let started = spawn_started_at
+        .lock()
+        .expect("spawn timer")
+        .take()
+        .expect("spawn timer marker");
     assert!(started.elapsed() < Duration::from_secs(2));
     let pid: u32 = fs::read_to_string(&marker)
         .expect("pid marker")