From: Andreas Schneider <asn@samba.org>
Date: Fri, 9 Apr 2021 12:33:09 +0000 (+0200)
Subject: testprogs: Use --suppress-prompt instead of -s for testparm
X-Git-Tag: tevent-0.11.0~994
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86f7bc7a3722a95cb2c0e45255affb1520e581f9;p=thirdparty%2Fsamba.git

testprogs: Use --suppress-prompt instead of -s for testparm

We should use long options in tests to make clear what we are trying to
do.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/testprogs/blackbox/test_weak_crypto.sh b/testprogs/blackbox/test_weak_crypto.sh
index 50a67aef110..e2cdfa71fca 100755
--- a/testprogs/blackbox/test_weak_crypto.sh
+++ b/testprogs/blackbox/test_weak_crypto.sh
@@ -32,7 +32,7 @@ opt="--option=gensec:gse_krb5=no -U${USERNAME}%${PASSWORD}"
 unset GNUTLS_FORCE_FIPS_MODE
 
 # Checks that testparm reports: Weak crypto is allowed
-testit_grep "testparm" "Weak crypto is allowed" $samba_testparm -s $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
+testit_grep "testparm" "Weak crypto is allowed" $samba_testparm --suppress-prompt $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
 
 # We should be allowed to use NTLM for connecting
 testit "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER $opt -c "getusername" || failed=`expr $failed + 1`
@@ -41,7 +41,7 @@ GNUTLS_FORCE_FIPS_MODE=1
 export GNUTLS_FORCE_FIPS_MODE
 
 # Checks that testparm reports: Weak crypto is disallowed
-testit_grep "testparm" "Weak crypto is disallowed" $samba_testparm -s $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
+testit_grep "testparm" "Weak crypto is disallowed" $samba_testparm --suppress-prompt $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
 
 # We should not be allowed to use NTLM for connecting
 testit_expect_failure "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER $opt -c "getusername" || failed=`expr $failed + 1`
diff --git a/testprogs/blackbox/test_weak_crypto_server.sh b/testprogs/blackbox/test_weak_crypto_server.sh
index 8e38b009947..fcd266d904b 100755
--- a/testprogs/blackbox/test_weak_crypto_server.sh
+++ b/testprogs/blackbox/test_weak_crypto_server.sh
@@ -35,7 +35,7 @@ test_weak_crypto_allowed()
 {
     local testparm_stderr_output_path="$PREFIX/testparm_stderr_output"
 
-    $samba_testparm -s $configuration 2>$testparm_stderr_output_path >/dev/null
+    $samba_testparm --suppress-prompt $configuration 2>$testparm_stderr_output_path >/dev/null
 
     grep "Weak crypto is allowed" $testparm_stderr_output_path >/dev/null 2>&1
     if [ $ret -ne 0 ]; then