[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-1965-gc0322e8
Andrew Bartlett
abartlet at samba.org
Fri May 30 04:37:10 GMT 2008
The branch, v4-0-test has been updated
via c0322e8e27d67655b7498b27df0829aa5682a345 (commit)
from 89fc39f7edb214065aff461bc225f41443eae3c7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit c0322e8e27d67655b7498b27df0829aa5682a345
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 30 14:36:24 2008 +1000
Don't pass an smb.conf to provision tests.
These tests will create their own smb.conf in their prefix anyway.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/selftest/samba4_tests.sh | 6 +++---
source/setup/tests/blackbox_newuser.sh | 9 ++++-----
source/setup/tests/blackbox_provision.sh | 23 +++++++++++------------
source/setup/tests/blackbox_setpassword.sh | 9 ++++-----
4 files changed, 22 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 9693451..c79c8a5 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -353,6 +353,6 @@ rm -rf $PREFIX/upgrade
plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
rm -rf $PREFIX/provision
mkdir $PREFIX/provision
-plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION"
-plantest "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision" "$CONFIGURATION"
-plantest "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision" "$CONFIGURATION"
+plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision"
+plantest "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision"
+plantest "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision"
diff --git a/source/setup/tests/blackbox_newuser.sh b/source/setup/tests/blackbox_newuser.sh
index fed5f7d..3e534f2 100755
--- a/source/setup/tests/blackbox_newuser.sh
+++ b/source/setup/tests/blackbox_newuser.sh
@@ -1,20 +1,19 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_newuser.sh PREFIX CONFIGURATION
+Usage: blackbox_newuser.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
testit "newuser" $PYTHON ./setup/newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass
diff --git a/source/setup/tests/blackbox_provision.sh b/source/setup/tests/blackbox_provision.sh
index 2afa9dc..1a915af 100755
--- a/source/setup/tests/blackbox_provision.sh
+++ b/source/setup/tests/blackbox_provision.sh
@@ -1,28 +1,27 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_provision.sh PREFIX CONFIGURATION
+Usage: blackbox_provision.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-default" $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
-testit "simple-member" $PYTHON ./setup/provision $CONFIGURATION --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member
-testit "simple-standalone" $PYTHON ./setup/provision $CONFIGURATION --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone
-testit "blank-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank
-testit "partitions-only-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only
+testit "simple-default" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-member" $PYTHON ./setup/provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member
+testit "simple-standalone" $PYTHON ./setup/provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone
+testit "blank-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank
+testit "partitions-only-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only
reprovision() {
- $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
- $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
+ $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
+ $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
}
testit "reprovision" reprovision
diff --git a/source/setup/tests/blackbox_setpassword.sh b/source/setup/tests/blackbox_setpassword.sh
index 7254661..89f1aa5 100755
--- a/source/setup/tests/blackbox_setpassword.sh
+++ b/source/setup/tests/blackbox_setpassword.sh
@@ -1,19 +1,18 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_setpassword.sh PREFIX CONFIGURATION
+Usage: blackbox_setpassword.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
testit "newuser" $PYTHON ./setup/newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass
--
Samba Shared Repository
More information about the samba-cvs
mailing list