From e5695f862f52de00723ea87a875c9a2de2ce9971 Mon Sep 17 00:00:00 2001
From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Tue, 11 Oct 2022 14:35:11 +0000
Subject: [PATCH] test_any_automated_install.py: Use `command -v` instead of
 `which`

Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
---
 test/test_any_automated_install.py | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py
index 0fd80f7e..56c492da 100644
--- a/test/test_any_automated_install.py
+++ b/test/test_any_automated_install.py
@@ -619,8 +619,8 @@ def test_FTL_detect_aarch64_no_errors(host):
     """
     # mock uname to return aarch64 platform
     mock_command("uname", {"-m": ("aarch64", "0")}, host)
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     # mock ldd to respond with aarch64 shared library
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux-aarch64.so.1", "0")}, host)
     detectPlatform = host.run(
@@ -647,8 +647,8 @@ def test_FTL_detect_armv4t_no_errors(host):
     """
     # mock uname to return armv4t platform
     mock_command("uname", {"-m": ("armv4t", "0")}, host)
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     # mock ldd to respond with armv4t shared library
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux.so.3", "0")}, host)
     detectPlatform = host.run(
@@ -675,8 +675,8 @@ def test_FTL_detect_armv5te_no_errors(host):
     """
     # mock uname to return armv5te platform
     mock_command("uname", {"-m": ("armv5te", "0")}, host)
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     # mock ldd to respond with ld-linux shared library
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux.so.3", "0")}, host)
     detectPlatform = host.run(
@@ -704,8 +704,8 @@ def test_FTL_detect_armv6l_no_errors(host):
     # mock uname to return armv6l platform
     mock_command("uname", {"-m": ("armv6l", "0")}, host)
     # mock ldd to respond with ld-linux-armhf shared library
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux-armhf.so.3", "0")}, host)
     detectPlatform = host.run(
         """
@@ -734,8 +734,8 @@ def test_FTL_detect_armv7l_no_errors(host):
     # mock uname to return armv7l platform
     mock_command("uname", {"-m": ("armv7l", "0")}, host)
     # mock ldd to respond with ld-linux-armhf shared library
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux-armhf.so.3", "0")}, host)
     detectPlatform = host.run(
         """
@@ -763,8 +763,8 @@ def test_FTL_detect_armv8a_no_errors(host):
     """
     # mock uname to return armv8a platform
     mock_command("uname", {"-m": ("armv8a", "0")}, host)
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     # mock ldd to respond with ld-linux-armhf shared library
     mock_command("ldd", {"/bin/sh": ("/lib/ld-linux-armhf.so.3", "0")}, host)
     detectPlatform = host.run(
@@ -789,8 +789,8 @@ def test_FTL_detect_x86_64_no_errors(host):
     """
     confirms only x86_64 package is downloaded for FTL engine
     """
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     detectPlatform = host.run(
         """
     source /opt/pihole/basic-install.sh
@@ -813,8 +813,8 @@ def test_FTL_detect_unknown_no_errors(host):
     """confirms only generic package is downloaded for FTL engine"""
     # mock uname to return generic platform
     mock_command("uname", {"-m": ("mips", "0")}, host)
-    # mock `which sh` to return `/bin/sh`
-    mock_command("which", {"sh": ("/bin/sh", "0")}, host)
+    # mock `command -v sh` to return `/bin/sh`
+    mock_command("command", {"-v sh": ("/bin/sh", "0")}, host)
     detectPlatform = host.run(
         """
     source /opt/pihole/basic-install.sh