Author: brad Date: 2006-10-24 01:25:09 +0000 (Tue, 24 Oct 2006) New Revision: 19472
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19472 Log: Move rpc tests to their own scripts. Run the same tests as 'make test' does. Comment those tests that don't pass. Added: branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh Modified: branches/SAMBA_4_0/source/script/tests/test_win.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_win.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/test_win.sh 2006-10-24 01:18:07 UTC (rev 19471) +++ branches/SAMBA_4_0/source/script/tests/test_win.sh 2006-10-24 01:25:09 UTC (rev 19472) @@ -32,24 +32,10 @@ $SMBTORTURE_PASSWORD $SMBTORTURE_WORKGROUP \ || all_errs=`expr $all_errs + $?` -rpc_tests="RPC-WINREG RPC-ASYNCBIND RPC-ATSVC RPC-DSSETUP RPC-EPMAPPER" -rpc_tests="$rpc_tests RPC-INITSHUTDOWN RPC-LSA-GETUSER RPC-MULTIBIND RPC-ROT" -rpc_tests="$rpc_tests RPC-SECRETS RPC-SRVSVC RPC-SVCCTL RPC-WKSSVC" +$WINTEST_DIR/wintest_rpc.sh $SMBTORTURE_REMOTE_HOST $SMBTORTURE_USERNAME \ + $SMBTORTURE_PASSWORD $SMBTORTURE_WORKGROUP \ + || all_errs=`expr $all_errs + $?` -for t in $rpc_tests; do - test_name="$t / WINDOWS SERVER" - old_errs=$all_errs - - testit "$test_name" $SMBTORTURE_BIN_PATH \ - -U $SMBTORTURE_USERNAME%$SMBTORTURE_PASSWORD \ - -W $SMBTORTURE_WORKGROUP \ - ncacn_np:$SMBTORTURE_REMOTE_HOST \ - $t || all_errs=`expr $all_errs + 1` - if [ $old_errs -lt $all_errs ]; then - restore_snapshot "\n$test_name failed." - fi -done - test_name="WINDOWS CLIENT / SAMBA SERVER SHARE" old_errs=$all_errs cat $WINTEST_DIR/common.exp > $TMPDIR/client_test.exp Added: branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh 2006-10-24 01:18:07 UTC (rev 19471) +++ branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh 2006-10-24 01:25:09 UTC (rev 19472) @@ -0,0 +1,63 @@ +#!/bin/sh + +. script/tests/test_functions.sh + +. script/tests/win/wintest_functions.sh + +# This variable is defined in the per-hosts .fns file. +. $WINTESTCONF + +if [ $# -lt 4 ]; then +cat <<EOF +Usage: test_rpc.sh SERVER USERNAME PASSWORD DOMAIN +EOF +exit 1; +fi + +server="$1" +username="$2" +password="$3" +domain="$4" +shift 4 + +ncacn_np_tests="RPC-SRVSVC RPC-UNIXINFO RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND" +# These tests fail on ncacn_np: RPC-SPOOLSS RPC-SCHANNEL RPC-JOIN RPC-LSA +# RPC-NETLOGON + +ncalrpc_tests="RPC-UNIXINFO RPC-ECHO" +# These tests fail on ncalrpc: RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP +# RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON + +ncacn_ip_tcp_tests="RPC-UNIXINFO RPC-ECHO" +# These tests fail on ncacn_ip_tcp: RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP +# RPC-ALTERCONTEXT RPC-MULTIBIND RPC-NETLOGON + +bind_options="seal,padcheck bigendian" + +test_type="ncalrpc ncacn_np ncacn_ip_tcp" + +all_errs=0 +for o in $bind_options; do + for transport in $test_type; do + case $transport in + ncalrpc) rpc_test=$ncalrpc_tests ;; + ncacn_np) rpc_test=$ncacn_np_tests ;; + ncacn_ip_tcp) rpc_test=$ncacn_ip_tcp_tests ;; + esac + + for t in $rpc_test; do + test_name="$t on $transport with $o" + old_errs=$all_errs + testit "$test_name" $SMBTORTURE_BIN_PATH \ + -U $username%$password \ + -W $domain \ + $transport:$server[$o] \ + $t || all_errs=`expr $all_errs + 1` + if [ $old_errs -lt $all_errs ]; then + restore_snapshot "\n$test_name failed." + fi + done + done +done + +testok $0 $all_errs Property changes on: branches/SAMBA_4_0/source/script/tests/win/wintest_rpc.sh ___________________________________________________________________ Name: svn:executable + *