summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2010-07-09 20:29:27 +0400
committerStefan Metzmacher <metze@samba.org>2010-07-10 11:18:18 +0200
commite962e7e9562f26b1ea6854b1a34f0237c3abf222 (patch)
tree0f93ba7e033ad1f5f8107eebe169992ad24b6550
parentcad04dabbb89b024628ab3ec9bf2772d2fbe5182 (diff)
downloadsamba-e962e7e9562f26b1ea6854b1a34f0237c3abf222.tar.gz
samba-e962e7e9562f26b1ea6854b1a34f0237c3abf222.tar.bz2
samba-e962e7e9562f26b1ea6854b1a34f0237c3abf222.zip
s4 unittests: remove the provision directory before (re)generating
-rwxr-xr-xsource4/setup/tests/blackbox_group.sh1
-rwxr-xr-xsource4/setup/tests/blackbox_newuser.sh1
-rwxr-xr-xsource4/setup/tests/blackbox_setpassword.sh1
3 files changed, 3 insertions, 0 deletions
diff --git a/source4/setup/tests/blackbox_group.sh b/source4/setup/tests/blackbox_group.sh
index f1d37b7692..adffad1cc7 100755
--- a/source4/setup/tests/blackbox_group.sh
+++ b/source4/setup/tests/blackbox_group.sh
@@ -13,6 +13,7 @@ shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+rm -rf $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
net="./bin/net"
diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh
index a295522e6e..612dedfd98 100755
--- a/source4/setup/tests/blackbox_newuser.sh
+++ b/source4/setup/tests/blackbox_newuser.sh
@@ -13,6 +13,7 @@ shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+rm -rf $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
net="./bin/net"
diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh
index 039278f77d..da81553179 100755
--- a/source4/setup/tests/blackbox_setpassword.sh
+++ b/source4/setup/tests/blackbox_setpassword.sh
@@ -14,6 +14,7 @@ shift 1
net="./bin/net"
+rm -rf $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" $net newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd