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 50a67aef1109b7daaf55c0e75d13dda38e551aef..e2cdfa71fcaff6cd852e338a4bf8ba75badcd5e8 100755 (executable)
--- 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 8e38b00994795204386bf4737edd3e1c1c5cd79a..fcd266d904b607618fffd7cd000a036e07627514 100755 (executable)
--- 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