From: Jule Anger <janger@samba.org>
Date: Tue, 16 Aug 2022 10:25:13 +0000 (+0200)
Subject: s3:tests: let smbstatus json tests fail if jq is not installed
X-Git-Tag: talloc-2.4.0~1421
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b91702a6ea2c6474e635d5ae5f7acd9aebbbab7;p=thirdparty%2Fsamba.git

s3:tests: let smbstatus json tests fail if jq is not installed

Signed-off-by: Jule Anger <janger@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/script/tests/test_smbstatus.sh b/source3/script/tests/test_smbstatus.sh
index 0eb186e3d86..b24fe735aa5 100755
--- a/source3/script/tests/test_smbstatus.sh
+++ b/source3/script/tests/test_smbstatus.sh
@@ -292,17 +292,6 @@ EOF
 		return 1
 	fi
 
-	out=$(cat $PREFIX/$status_json | jq ".")
-	echo $out | grep -c 'jq: not found'
-	ret=$?
-	if [ $ret -eq 0 ]; then
-		subunit_start_test "test_smbstatus_json"
-		subunit_skip_test "test_smbstatus_json" <<EOF
-Test needs jq
-EOF
-		return 0
-	fi
-
 	out=$(cat $PREFIX/$status_json | jq ".")
 	ret=$?
 	if [ $ret -ne 0 ]; then
@@ -424,17 +413,6 @@ EOF
 		return 1
 	fi
 
-	out=$(cat $PREFIX/$status_json | jq ".")
-	echo $out | grep -c 'jq: not found'
-	ret=$?
-	if [ $ret -eq 0 ]; then
-		subunit_start_test "test_smbstatus_json_profile"
-		subunit_skip_test "test_smbstatus_json_profile" <<EOF
-Test needs jq
-EOF
-		return 0
-	fi
-
 	out=$(cat $PREFIX/$status_json | jq ".")
 	ret=$?
 	if [ $ret -ne 0 ]; then