From 37af8b51b3dd320bdf85f2c2591f6bbf4f9b4c6d Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Fri, 21 Jul 2023 03:37:48 -0400 Subject: [PATCH] Fallback to pgrep if pidof is unavailable --- substrate/client/tests/common/mod.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/substrate/client/tests/common/mod.rs b/substrate/client/tests/common/mod.rs index f119c11f..57e30516 100644 --- a/substrate/client/tests/common/mod.rs +++ b/substrate/client/tests/common/mod.rs @@ -29,7 +29,16 @@ macro_rules! serai_test { let guard = common::SEQUENTIAL.lock().await; let is_running = || { - !Command::new("pidof").arg("serai-node").output().unwrap().stdout.is_empty() + !( + if let Ok(res) = Command::new("pidof").arg("serai-node").output() { + res + } else { + Command::new("pgrep") + .arg("serai-node") + .output() + .expect("neither pidof nor pgrep were available") + } + ).stdout.is_empty() }; // Spawn a fresh Serai node