Make the purge first so that the provision can reused during tests
authorMatthieu Patou <mat@matws.net>
Fri, 20 May 2011 16:45:43 +0000 (20:45 +0400)
committerMatthieu Patou <mat@samba.org>
Sat, 21 May 2011 06:41:07 +0000 (08:41 +0200)
source4/setup/tests/blackbox_upgradeprovision.sh

index 05b155d5214f131b7f7d531359945c7042526773..6d26105b4527b1a1a6ce08852224513c1c3a699f 100755 (executable)
@@ -28,9 +28,6 @@ upgradeprovision_full() {
        $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
 }
 
-testit "upgradeprovision" upgradeprovision
-testit "upgradeprovision_full" upgradeprovision_full
-
 if [ -d $PREFIX/upgradeprovision ]; then
   rm -fr $PREFIX/upgradeprovision
 fi
@@ -39,4 +36,7 @@ if [ -d $PREFIX/upgradeprovision_full ]; then
   rm -fr $PREFIX/upgradeprovision_full
 fi
 
+testit "upgradeprovision" upgradeprovision
+testit "upgradeprovision_full" upgradeprovision_full
+
 exit $failed