summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-09-08 14:18:04 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-09-08 14:18:04 +1000
commit171986aea25ae5fe7a27cfe5247f2be08163193c (patch)
tree9b5f9e32961c7d2eb9677d9ee89cdf1c470a25b7
parent3eb6f79a02de6820581b91f8d9be80b8dd620119 (diff)
downloadsamba-171986aea25ae5fe7a27cfe5247f2be08163193c.tar.gz
samba-171986aea25ae5fe7a27cfe5247f2be08163193c.tar.bz2
samba-171986aea25ae5fe7a27cfe5247f2be08163193c.zip
Move blackbox.smbclient to test against the member server.
The DC is now using smb signing, so testing for the old SMB versions won't work. Add a new test script to check 'net join' independent of blackbox.smbclient. Andrew Bartlett (This used to be commit 44ff392ffea52e89a3ac096a6d381ae540d3473c)
-rwxr-xr-xsource4/client/tests/test_smbclient.sh6
-rwxr-xr-xsource4/selftest/samba4_tests.sh3
-rwxr-xr-xsource4/utils/tests/test_net.sh39
3 files changed, 41 insertions, 7 deletions
diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index 27a3488c88..7ff03ba6e2 100755
--- a/source4/client/tests/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -43,8 +43,6 @@ testit "share and server list" $VALGRIND $smbclient -L $SERVER $CONFIGURATION -
testit "share and server list anonymously" $VALGRIND $smbclient -N -L $SERVER $CONFIGURATION $@ || failed=`expr $failed + 1`
-testit "domain join" $VALGRIND bin/net join $DOMAIN $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
# Generate random file
cat >tmpfile<<EOF
foo
@@ -128,10 +126,6 @@ runcmd "List directory with LANMAN2" 'ls' -m LANMAN2 || failed=`expr $failed + 1
runcmd "Print current working directory" 'pwd'|| failed=`expr $failed + 1`
-testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no || failed=`expr $failed + 1`
-
-testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes || failed=`expr $failed + 1`
-
(
echo "password=$PASSWORD"
echo "username=$USERNAME"
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index e67e035c31..82c57de29a 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -268,7 +268,7 @@ fi
bbdir=$incdir/../../testprogs/blackbox
plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh
-plantest "blackbox.smbclient" dc $samba4srcdir/client/tests/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION
plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
@@ -297,6 +297,7 @@ plantest "rpc.echo against member server with domain creds" member $VALGRIND $sm
plantest "rpc.samr against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR" "$*"
plantest "rpc.samr.users against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-USERS" "$*"
plantest "rpc.samr.passwords against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-PASSWORDS" "$*"
+plantest "blackbox.smbclient against member server with local creds" member $samba4srcdir/client/tests/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$NETBIOSNAME" "$PREFIX"
NBT_TESTS=`$smb4torture --list | grep "^NBT-" | xargs`
diff --git a/source4/utils/tests/test_net.sh b/source4/utils/tests/test_net.sh
new file mode 100755
index 0000000000..3406c87cda
--- /dev/null
+++ b/source4/utils/tests/test_net.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Blackbox tests for net
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+shift 4
+
+failed=0
+
+samba4bindir=`dirname $0`/../../bin
+smbclient=$samba4bindir/smbclient
+
+testit() {
+ name="$1"
+ shift
+ cmdline="$*"
+ echo "test: $name"
+ $cmdline
+ status=$?
+ if [ x$status = x0 ]; then
+ echo "success: $name"
+ else
+ echo "failure: $name"
+ failed=`expr $failed + 1`
+ fi
+ return $status
+}
+
+testit "domain join" $VALGRIND bin/net join $DOMAIN $CONFIGURATION -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+testit "Test login with --machine-pass without kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k no || failed=`expr $failed + 1`
+
+testit "Test login with --machine-pass and kerberos" $VALGRIND $smbclient -c 'ls' $CONFIGURATION //$SERVER/tmp --machine-pass -k yes || failed=`expr $failed + 1`
+
+exit $failed
+
+