From ee12f76cbe013b9ea891ddfaac871969563afbbf Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz.leutgeb@radicle.xyz>
Date: Fri, 16 May 2025 14:22:02 +0200
Subject: [PATCH] cli/tests: Fix nextest running via Nix

---
 .gitignore                    |  1 +
 flake.nix                     |  4 ++--
 radicle-cli/tests/commands.rs | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index b63f2e1f..82f0798f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /build/*.tar.gz
 /.pre-commit-config.yaml
 /.direnv/
+/result
diff --git a/flake.nix b/flake.nix
index 79b7d930..fa50fbc5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -218,8 +218,8 @@
               # avoid timeouts
               preCheck = ''
                 patchShebangs --build radicle-cli/examples/rad-cob-multiset
-                              cargo build -p radicle-remote-helper --target-dir radicle-cli/target
-                              cargo build -p radicle-cli --target-dir radicle-cli/target
+                cargo build -p radicle-remote-helper --target-dir radicle-cli/target
+                cargo build -p radicle-cli --target-dir radicle-cli/target
               '';
               # Ensure dev is used since we rely on env variables being
               # set in tests.
diff --git a/radicle-cli/tests/commands.rs b/radicle-cli/tests/commands.rs
index cfaadc49..806d647f 100644
--- a/radicle-cli/tests/commands.rs
+++ b/radicle-cli/tests/commands.rs
@@ -208,16 +208,16 @@ fn rad_cob_multiset() {
         // `rad-cob-multiset` is a `jq` script, which requires `jq` to be installed.
         // We test whether `jq` is installed, and have this test succeed if it is not.
         // Programmatic skipping of tests is not supported as of 2024-08.
+        use std::io::ErrorKind;
+        use std::process::{Command, Stdio};
 
-        let output = std::process::Command::new("/usr/bin/env")
-            .arg("jq")
-            .arg("-V")
-            .output()
-            .unwrap();
-
-        if !output.status.success() {
-            log::warn!(target: "test", "`jq` not found. Succeeding prematurely. {:?}", output);
-            return;
+        match Command::new("jq").arg("-V").stdout(Stdio::null()).status() {
+            Err(e) if e.kind() == ErrorKind::NotFound => {
+                log::warn!(target: "test", "`jq` not found. Succeeding prematurely.");
+                return;
+            }
+            Err(e) => panic!("while checking for jq: {}", e),
+            Ok(_) => {}
         }
     }