X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/8cda195cdbf9cc5f17c195a7f98167e3e9c4657b..981d8b73e14d907ddbd9c5c17818051fcdf1bd50:/tests/setup

diff --git a/tests/setup b/tests/setup
index 3ba48c1..9e3d535 100644
--- a/tests/setup
+++ b/tests/setup
@@ -18,8 +18,12 @@ UVERSION=`echo "$VERSION" | sed s/[-.]/_/g`
 TESTID="${TESTNAME}_$UVERSION"
 echo "$TESTID"
 TESTDIR="testdir_${TESTNAME}_$VERSION"
-export WIZARD_ADMIN_NAME="admin"
-export WIZARD_ADMIN_PASSWORD="wizard"
+if [ "$WIZARD_ADMIN_NAME" == "" ]; then
+    export WIZARD_ADMIN_NAME="admin"
+fi
+if [ "$WIZARD_ADMIN_PASSWORD" == "" ]; then
+    export WIZARD_ADMIN_PASSWORD="wizard"
+fi
 
 if [ -e "config" ]; then
     source ./config
@@ -27,6 +31,6 @@ fi
 
 if [ -e "$TESTDIR" ]; then
     echo "Removing previous $TESTDIR folder..."
-    rm -Rf "$TESTDIR"
+    wizard remove "$TESTDIR" || rm -Rf "$TESTDIR"
 fi