From 0410dcb32d772ee5022bd3bb507a5650ef6c5071 Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 12 Jun 2008 07:02:14 -0400 Subject: Initial automated wintest. Added a blackbox test which looks for $WINTEST_CONF_DIR, gets configuration vars from *.conf in that dir, disables smbwrapper, and runs RAW-OPEN torture test. Scripts are coming to startup/shutdown vm's. (This used to be commit 74a0a9bb54b2583dde7a5fbadd4d10858de12ee7) --- testprogs/blackbox/test_wintest.sh | 45 +++++++++++++++++++++++++++++++++ testprogs/blackbox/wintest/wintest.conf | 7 +++++ 2 files changed, 52 insertions(+) create mode 100755 testprogs/blackbox/test_wintest.sh create mode 100644 testprogs/blackbox/wintest/wintest.conf diff --git a/testprogs/blackbox/test_wintest.sh b/testprogs/blackbox/test_wintest.sh new file mode 100755 index 0000000000..8bbe4f2984 --- /dev/null +++ b/testprogs/blackbox/test_wintest.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# Blackbox tests for testing against windows machines +# Copyright (C) 2008 Jim McDonough + + +testwithconf() { +# define test variables, startup/shutdown scripts +. $1 +shift 1 + +if [ -n "$WINTEST_STARTUP" ]; then +. $WINTEST_STARTUP; +fi + +testit "smbtorture" $smbtorture //$SERVER/$SHARE RAW-OPEN -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1` + +if [ -n "$WINTEST_SHUTDOWN" ]; then +. $WINTEST_SHUTDOWN; +fi +} + + +# main +# skip without WINTEST_CONF_DIR +if [ -z "$WINTEST_CONF_DIR" ]; then +exit 0; +fi + +SOCKET_WRAPPER_DIR= +export -n SOCKET_WRAPPER_DIR + +failed=0 + +$basedir=`pwd` + +samba4bindir=`dirname $0`/../../source/bin +smbtorture=$samba4bindir/smbtorture + +. `dirname $0`/subunit.sh + +for wintest_conf in $WINTEST_CONF_DIR/*.conf; do +testwithconf "$wintest_conf" $@; +done + +exit $failed diff --git a/testprogs/blackbox/wintest/wintest.conf b/testprogs/blackbox/wintest/wintest.conf new file mode 100644 index 0000000000..d52e660318 --- /dev/null +++ b/testprogs/blackbox/wintest/wintest.conf @@ -0,0 +1,7 @@ +#export WINTEST_STARTUP=/tmp/blah +#export WINTEST_SHUTDOWN=/tmp/blah2 +export DOMAIN="wait" +export USERNAME="administrator" +export PASSWORD="samba" +export SERVER="192.168.213.161" +export SHARE="c\$" \ No newline at end of file -- cgit From f3fb381952e6afd4b3d15758eaf3aaf29a112eec Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 12 Jun 2008 07:06:07 -0400 Subject: Missed these on the last commit (This used to be commit 0e8f946ed02a6d2d9469f9ccab5f3342b2b80725) --- source4/selftest/samba4_tests.sh | 1 + testprogs/blackbox/wintest/wintest.conf | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 1d550cbfe1..e9fbede4fb 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -279,6 +279,7 @@ plantest "blackbox.masktest" dc $bbdir/test_masktest.sh "\$SERVER" "\$USERNAME" plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" plantest "blackbox.wbinfo" dc $bbdir/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc" plantest "blackbox.wbinfo" member $bbdir/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member" +plantest "blackbox.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS" # Tests using the "Simple" NTVFS backend diff --git a/testprogs/blackbox/wintest/wintest.conf b/testprogs/blackbox/wintest/wintest.conf index d52e660318..d1403662f9 100644 --- a/testprogs/blackbox/wintest/wintest.conf +++ b/testprogs/blackbox/wintest/wintest.conf @@ -1,6 +1,6 @@ -#export WINTEST_STARTUP=/tmp/blah -#export WINTEST_SHUTDOWN=/tmp/blah2 -export DOMAIN="wait" +#export WINTEST_STARTUP="/tmp/startup client" +#export WINTEST_SHUTDOWN=/tmp/shutdown client" +export DOMAIN="client" export USERNAME="administrator" export PASSWORD="samba" export SERVER="192.168.213.161" -- cgit