[SCM] Samba Shared Repository - branch master updated - 3e5ba883b3dd82e5285d98b8c5083336c478ba04

Jelmer Vernooij jelmer at samba.org
Tue Sep 16 16:39:35 GMT 2008


The branch, master has been updated
       via  3e5ba883b3dd82e5285d98b8c5083336c478ba04 (commit)
       via  740f67d7815250eca67c15b690a8d3f28b377ad2 (commit)
       via  d7a0c26af47507910ab8b9363b6c6f2e2815b3d3 (commit)
       via  aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56 (commit)
      from  c2eb4e5f8e0275003f9cffe1feeee6e34b7e578e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3e5ba883b3dd82e5285d98b8c5083336c478ba04
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 16 18:39:08 2008 +0200

    Fix paths to subunit.sh

commit 740f67d7815250eca67c15b690a8d3f28b377ad2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 16 18:34:40 2008 +0200

    Avoid running target-specific tests during general test run,

commit d7a0c26af47507910ab8b9363b6c6f2e2815b3d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 16 18:30:24 2008 +0200

    Move torture/ blackbox tests closer to code they're testing.

commit aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 16 18:16:49 2008 +0200

    Move ndrdump tests closer to the code they test.

-----------------------------------------------------------------------

Summary of changes:
 source4/librpc/tests/samr-CreateUser-in.dat        |  Bin 0 -> 60 bytes
 source4/librpc/tests/samr-CreateUser-out.dat       |  Bin 0 -> 32 bytes
 source4/librpc/tests/test_ndrdump.sh               |   20 ++++++++++
 source4/selftest/samba4_tests.sh                   |   13 +++---
 source4/torture/tests/test_gentest.sh              |   34 ++++++++++++++++
 source4/torture/tests/test_locktest.sh             |   28 +++++++++++++
 source4/torture/tests/test_masktest.sh             |   28 +++++++++++++
 testdata/minschema_classes.txt                     |   41 ++++++++++++++++++++
 testprogs/blackbox/ndrdump/samr-CreateUser-in.dat  |  Bin 60 -> 0 bytes
 testprogs/blackbox/ndrdump/samr-CreateUser-out.dat |  Bin 32 -> 0 bytes
 testprogs/blackbox/test_gentest.sh                 |   34 ----------------
 testprogs/blackbox/test_locktest.sh                |   28 -------------
 testprogs/blackbox/test_masktest.sh                |   28 -------------
 testprogs/blackbox/test_ndrdump.sh                 |   20 ----------
 testprogs/ejs/minschema_classes.txt                |   41 --------------------
 15 files changed, 158 insertions(+), 157 deletions(-)
 create mode 100644 source4/librpc/tests/samr-CreateUser-in.dat
 create mode 100644 source4/librpc/tests/samr-CreateUser-out.dat
 create mode 100755 source4/librpc/tests/test_ndrdump.sh
 create mode 100755 source4/torture/tests/test_gentest.sh
 create mode 100755 source4/torture/tests/test_locktest.sh
 create mode 100755 source4/torture/tests/test_masktest.sh
 create mode 100644 testdata/minschema_classes.txt
 delete mode 100644 testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
 delete mode 100644 testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
 delete mode 100755 testprogs/blackbox/test_gentest.sh
 delete mode 100755 testprogs/blackbox/test_locktest.sh
 delete mode 100755 testprogs/blackbox/test_masktest.sh
 delete mode 100755 testprogs/blackbox/test_ndrdump.sh
 delete mode 100644 testprogs/ejs/minschema_classes.txt


Changeset truncated at 500 lines:

diff --git a/source4/librpc/tests/samr-CreateUser-in.dat b/source4/librpc/tests/samr-CreateUser-in.dat
new file mode 100644
index 0000000..a5840e1
Binary files /dev/null and b/source4/librpc/tests/samr-CreateUser-in.dat differ
diff --git a/source4/librpc/tests/samr-CreateUser-out.dat b/source4/librpc/tests/samr-CreateUser-out.dat
new file mode 100644
index 0000000..cf9131d
Binary files /dev/null and b/source4/librpc/tests/samr-CreateUser-out.dat differ
diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
new file mode 100755
index 0000000..dddfc0e
--- /dev/null
+++ b/source4/librpc/tests/test_ndrdump.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Blackbox tests for masktest
+# Copyright (C) 2008 Andrew Tridgell
+# Copyright (C) 2008 Andrew Bartlett
+# based on test_smbclient.sh
+
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+
+failed=0
+
+samba4bindir=`dirname $0`/../../source4/bin
+ndrdump=$samba4bindir/ndrdump
+files=`dirname $0`/ndrdump
+
+testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
+testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
+testit "ndrdump with --context-file" $VALGRIND $ndrdump --context-file $files/samr-CreateUser-in.dat samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
+testit "ndrdump with validate" $VALGRIND $ndrdump --validate samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
+
+exit $failed
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 6f6ffbb..d98910c 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -155,6 +155,7 @@ for t in $net; do
 done
 
 # Tests for session keys
+# FIXME: Integrate these into a single smbtorture test
 
 bindoptions=""
 transport="ncacn_np"
@@ -263,22 +264,22 @@ fi
 
 # Blackbox Tests:
 # tests that interact directly with the command-line tools rather than using 
-# the API
+# the API. These mainly test that the various command-line options of commands 
+# work correctly.
 
 bbdir=$incdir/../../testprogs/blackbox
 
-plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh
+plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh
 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" 
 plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
-plantest "blackbox.locktest" dc $bbdir/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
-plantest "blackbox.masktest" dc $bbdir/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
-plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.locktest" dc $samba4srcdir/torture/tests/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.masktest" dc $samba4srcdir/torture/tests/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.gentest" dc $samba4srcdir/torture/tests/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
 plantest "blackbox.wbinfo" dc $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
 plantest "blackbox.wbinfo" member $samba4srcdir/nsswitch/tests/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/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
new file mode 100755
index 0000000..2f4d00d
--- /dev/null
+++ b/source4/torture/tests/test_gentest.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Blackbox tests for gentest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 4 ]; then
+cat <<EOF
+Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+shift 4
+failed=0
+
+samba4bindir=`dirname $0`/../../bin
+gentest=$samba4bindir/gentest
+
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+
+cat <<EOF > st/gentest.ignore
+all_info.out.fname
+internal_information.out.file_id
+EOF
+
+testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+rm -f st/gentest.ignore
+
+exit $failed
diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh
new file mode 100755
index 0000000..1fe39b4
--- /dev/null
+++ b/source4/torture/tests/test_locktest.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Blackbox tests for locktest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 5 ]; then
+cat <<EOF
+Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+PREFIX=$5
+shift 5
+failed=0
+
+samba4bindir=`dirname $0`/../../bin
+locktest=$samba4bindir/locktest
+
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+
+testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+exit $failed
diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh
new file mode 100755
index 0000000..59165e4
--- /dev/null
+++ b/source4/torture/tests/test_masktest.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Blackbox tests for masktest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 5 ]; then
+cat <<EOF
+Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+PREFIX=$5
+shift 5
+failed=0
+
+samba4bindir=`dirname $0`/../../bin
+masktest=$samba4bindir/masktest
+
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+
+testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+exit $failed
diff --git a/testdata/minschema_classes.txt b/testdata/minschema_classes.txt
new file mode 100644
index 0000000..30f5b8c
--- /dev/null
+++ b/testdata/minschema_classes.txt
@@ -0,0 +1,41 @@
+applicationSettings
+builtinDomain
+classSchema
+computer
+configuration
+container
+crossRef
+crossRefContainer
+dMD
+domain
+domainDNS
+foreignSecurityPrincipal
+group
+infrastructureUpdate
+leaf
+nTDSDSA
+nTDSService
+organizationalPerson
+organizationalUnit
+person
+primaryDomain
+rIDManager
+secret
+server
+serversContainer
+site
+sitesContainer
+subSchema
+user
+displaySpecifier
+foreignSecurityPrincipal
+trustedDomain
+attributeSchema
+subSchema
+queryPolicy
+groupPolicyContainer
+ipsecPolicy
+ipsecISAKMPPolicy
+ipsecNFA
+ipsecFilter
+ipsecNegotiationPolicy
diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat
deleted file mode 100644
index a5840e1..0000000
Binary files a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat and /dev/null differ
diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat
deleted file mode 100644
index cf9131d..0000000
Binary files a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat and /dev/null differ
diff --git a/testprogs/blackbox/test_gentest.sh b/testprogs/blackbox/test_gentest.sh
deleted file mode 100755
index 046f280..0000000
--- a/testprogs/blackbox/test_gentest.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Blackbox tests for gentest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 4 ]; then
-cat <<EOF
-Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-shift 4
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-gentest=$samba4bindir/gentest
-
-. `dirname $0`/subunit.sh
-
-cat <<EOF > st/gentest.ignore
-all_info.out.fname
-internal_information.out.file_id
-EOF
-
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-/bin/rm -f st/gentest.ignore
-
-exit $failed
diff --git a/testprogs/blackbox/test_locktest.sh b/testprogs/blackbox/test_locktest.sh
deleted file mode 100755
index 9cad4da..0000000
--- a/testprogs/blackbox/test_locktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for locktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-locktest=$samba4bindir/locktest
-
-. `dirname $0`/subunit.sh
-
-testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/blackbox/test_masktest.sh b/testprogs/blackbox/test_masktest.sh
deleted file mode 100755
index 4409662..0000000
--- a/testprogs/blackbox/test_masktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for masktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-masktest=$samba4bindir/masktest
-
-. `dirname $0`/subunit.sh
-
-testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/blackbox/test_ndrdump.sh b/testprogs/blackbox/test_ndrdump.sh
deleted file mode 100755
index 50fd76b..0000000
--- a/testprogs/blackbox/test_ndrdump.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Blackbox tests for masktest
-# Copyright (C) 2008 Andrew Tridgell
-# Copyright (C) 2008 Andrew Bartlett
-# based on test_smbclient.sh
-
-. `dirname $0`/subunit.sh
-
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-ndrdump=$samba4bindir/ndrdump
-files=`dirname $0`/ndrdump
-
-testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with --context-file" $VALGRIND $ndrdump --context-file $files/samr-CreateUser-in.dat samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`
-testit "ndrdump with validate" $VALGRIND $ndrdump --validate samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/ejs/minschema_classes.txt b/testprogs/ejs/minschema_classes.txt
deleted file mode 100644
index 30f5b8c..0000000
--- a/testprogs/ejs/minschema_classes.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-applicationSettings
-builtinDomain
-classSchema
-computer
-configuration
-container
-crossRef
-crossRefContainer
-dMD
-domain
-domainDNS
-foreignSecurityPrincipal
-group
-infrastructureUpdate
-leaf
-nTDSDSA
-nTDSService
-organizationalPerson
-organizationalUnit
-person
-primaryDomain
-rIDManager
-secret
-server
-serversContainer
-site
-sitesContainer
-subSchema
-user
-displaySpecifier
-foreignSecurityPrincipal
-trustedDomain
-attributeSchema
-subSchema
-queryPolicy
-groupPolicyContainer
-ipsecPolicy
-ipsecISAKMPPolicy
-ipsecNFA
-ipsecFilter
-ipsecNegotiationPolicy


-- 
Samba Shared Repository


More information about the samba-cvs mailing list