svn commit: samba r7758 - in branches/SAMBA_4_0/source/script/tests: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-19 13:27:22 +0000 (Sun, 19 Jun 2005)
New Revision: 7758

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7758

Log:
When not running on the build farm, print out the failed command line again.

Add NTLMv2 varients to the echo and session key tests.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/script/tests/test_echo.sh
   branches/SAMBA_4_0/source/script/tests/test_functions.sh
   branches/SAMBA_4_0/source/script/tests/test_session_key.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_echo.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_echo.sh	2005-06-19 13:26:32 UTC (rev 7757)
+++ branches/SAMBA_4_0/source/script/tests/test_echo.sh	2005-06-19 13:27:22 UTC (rev 7758)
@@ -32,15 +32,18 @@
         "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:128bit=no --option=torture:echo_TestSleep=no" \
         "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:echo_TestSleep=no" \
         "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
+        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
+        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes  --option=torture:echo_TestSleep=no" \
+        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
     ; do
-   name="$transport with $bindoptions and $ntlmoptions"
+   name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
   done
  done
 done
 
 # separately test the print option - its v slow
-name="print option"
+name="RPC-ECHO with print option"
 testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[print]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_functions.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-06-19 13:26:32 UTC (rev 7757)
+++ branches/SAMBA_4_0/source/script/tests/test_functions.sh	2005-06-19 13:27:22 UTC (rev 7758)
@@ -109,7 +109,7 @@
 			echo "TEST FAILED: $name (status $status)"
 			echo "=========================================="
    		else
-			echo "TEST FAILED: $name (status $status)"
+			echo "TEST FAILED: $cmdline (status $status)"
 		fi
 		return 1;
 	fi

Modified: branches/SAMBA_4_0/source/script/tests/test_session_key.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2005-06-19 13:26:32 UTC (rev 7757)
+++ branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2005-06-19 13:27:22 UTC (rev 7758)
@@ -25,9 +25,14 @@
         "--option=usespnego=yes--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:128bit=no" \
         "--option=usespnego=yes --option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no" \
         "--option=usespnego=yes --option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=yes" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=yes --option=ntlmssp_client:128bit=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no --option=ntlmssp_client:128bit=no" \
+        "--option=usespnego=no --option=clientntlmv2auth=yes" \
         "--option=usespnego=no" \
     ; do
-   name="$transport with $ntlmoptions"
+   name="RPC-SECRETS on $transport with $ntlmoptions"
    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-SECRETS "$*" || failed=`expr $failed + 1`
   done
 testok $0 $failed