From 5db63524bec701045913851946191cf7adf0524d Mon Sep 17 00:00:00 2001
From: zackees <z@zackees.com>
Date: Sat, 25 Jul 2026 15:21:04 -0700
Subject: [PATCH] fix(dylint): normalize remaining test paths

Route the daemon ownership subprocess probe through fbuild's captured runner and use NormalizedPath in both affected test modules.
---
 .../src/board/tests_common_board_vidpid.rs    |  6 +--
 crates/fbuild-paths/src/daemon_ownership.rs   | 42 +++++++++++--------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/crates/fbuild-config/src/board/tests_common_board_vidpid.rs b/crates/fbuild-config/src/board/tests_common_board_vidpid.rs
index bd6a07ce9..6a112590c 100644
--- a/crates/fbuild-config/src/board/tests_common_board_vidpid.rs
+++ b/crates/fbuild-config/src/board/tests_common_board_vidpid.rs
@@ -1,12 +1,12 @@
 //! Regression tests for the FastLED/boards USB identity boundary.
 
 use std::fs;
-use std::path::PathBuf;
 
+use fbuild_core::path::NormalizedPath;
 use serde_json::Value;
 
-fn bundled_boards_dir() -> PathBuf {
-    PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("assets/boards/json")
+fn bundled_boards_dir() -> NormalizedPath {
+    NormalizedPath::new(env!("CARGO_MANIFEST_DIR")).join("assets/boards/json")
 }
 
 #[test]
diff --git a/crates/fbuild-paths/src/daemon_ownership.rs b/crates/fbuild-paths/src/daemon_ownership.rs
index 919109350..418587146 100644
--- a/crates/fbuild-paths/src/daemon_ownership.rs
+++ b/crates/fbuild-paths/src/daemon_ownership.rs
@@ -158,7 +158,6 @@ pub fn remove_owner_claim() {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::path::PathBuf;
     use tempfile::TempDir;
 
     #[test]
@@ -243,7 +242,7 @@ mod tests {
         let path = temp.path().join(OWNER_CLAIM_NAME);
         let claim = OwnerClaim {
             pid: 4242,
-            exe: PathBuf::from("/usr/local/bin/fbuild-daemon").into(),
+            exe: NormalizedPath::new("/usr/local/bin/fbuild-daemon"),
             version: "9.9.9".to_string(),
             mode: "dev".to_string(),
             cache_root_key: "abc123".to_string(),
@@ -296,7 +295,7 @@ mod tests {
     fn subprocess_probe_root_owner() {
         let root = std::env::var_os("FBUILD_TEST_ROOT_OWNER_PATH").expect("test lock path");
         let expected = std::env::var("FBUILD_TEST_ROOT_OWNER_EXPECT").expect("expectation");
-        let path = PathBuf::from(root);
+        let path = NormalizedPath::new(Path::new(&root));
         let acquired = RootOwnershipGuard::try_acquire_at(&path)
             .expect("root ownership probe io")
             .is_some();
@@ -309,22 +308,31 @@ mod tests {
         let path = temp.path().join("root-owner.lock");
 
         let run_probe = |expected: &str| {
-            // allow-direct-spawn: test helper re-executes this test binary to model another process.
-            let output = std::process::Command::new(std::env::current_exe().unwrap())
-                .args([
-                    "--ignored",
-                    "--exact",
-                    "daemon_ownership::tests::subprocess_probe_root_owner",
-                    "--nocapture",
-                ])
-                .env("FBUILD_TEST_ROOT_OWNER_PATH", &path)
-                .env("FBUILD_TEST_ROOT_OWNER_EXPECT", expected)
-                .output()
-                .expect("run subprocess probe");
+            let executable = std::env::current_exe().expect("current test executable");
+            let executable = executable.to_string_lossy();
+            let lock_path = path.to_string_lossy();
+            let args = [
+                executable.as_ref(),
+                "--ignored",
+                "--exact",
+                "daemon_ownership::tests::subprocess_probe_root_owner",
+                "--nocapture",
+            ];
+            let env = [
+                ("FBUILD_TEST_ROOT_OWNER_PATH", lock_path.as_ref()),
+                ("FBUILD_TEST_ROOT_OWNER_EXPECT", expected),
+            ];
+            let output = fbuild_core::subprocess::run_command_blocking(
+                &args,
+                None,
+                Some(&env),
+                Some(std::time::Duration::from_secs(30)),
+            )
+            .expect("run subprocess probe");
             assert!(
-                output.status.success(),
+                output.success(),
                 "subprocess root-owner probe failed: {}",
-                String::from_utf8_lossy(&output.stderr)
+                output.stderr
             );
         };