Fix non-zero shell exit code and --continue in wrong directory.

[wizard.git] / tests / mediawiki-continue-upgrade-test.sh

diff --git a/tests/mediawiki-continue-upgrade-test.sh b/tests/mediawiki-continue-upgrade-test.sh
index 4978cbd70f9af8dffc457477350b368355752807..6c1f7191c5af9ed7b0419a4406b858668f01f455 100755 (executable)
--- a/tests/mediawiki-continue-upgrade-test.sh
+++ b/tests/mediawiki-continue-upgrade-test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+cd `dirname $0`
 
 TESTNAME="mediawiki_continue_upgrade"
 source ./setup
@@ -11,7 +12,7 @@ mv "$TESTDIR/$FROB" "$TESTDIR/$FROB.bak"
 echo "this is a bad file" > "$TESTDIR/$FROB"
 
 # attempt an upgrade, this will fail
-RESULT=`! wizard upgrade "$TESTDIR" --log-file=/tmp/testboo`
+RESULT=`! wizard upgrade "$TESTDIR" --non-interactive`
 TMPTESTDIR=`echo "$RESULT" | awk '{print $2}'`
 
 # resolve the upgrade