X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS-Test%2Fbin%2Ffreeside-test-start;h=ed8e131a99086ef738f7194d417e9dbab8168b53;hp=596879e1c3db9a377b446542a10198e162db7cff;hb=e949bed143088a77ba89a56ff2a25609a1050159;hpb=b25efe03cc7945773363ba74e2012646c258a1b5

diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start
index 596879e1c..ed8e131a9 100755
--- a/FS-Test/bin/freeside-test-start
+++ b/FS-Test/bin/freeside-test-start
@@ -4,12 +4,15 @@ VERSION='5.0.1'
 
 set -ae
 
+# get the parent directory of bin/(this script)
+testroot=$( dirname ${BASH_SOURCE[0]} )
+testroot=$( cd $testroot; cd ..; pwd )
+
 echo "Stopping services."
 sudo service freeside stop
 sudo service apache2 stop
 
 newname=freeside_`date +%Y%m%d`
-sharedir=$(perl -MFS::Test -e "print FS::Test::share_dir()")
 
 # get company_name from existing DB, strip whitespace
 # (if there is no existing DB, continue anyway)
@@ -34,23 +37,15 @@ fi
 if [ $createdb = YES ]; then
   echo "Creating new database from stock schema."
   createdb --owner=freeside freeside
-  sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null
-fi
-
-if [ -f /usr/local/etc/freeside/htpasswd ]; then
-  newhtpasswd=htpasswd_`date +%Y%m%d`
-  echo "Renaming htpasswd to $newhtpasswd."
-  sudo mv /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/$newhtpasswd
+  sudo -u freeside psql freeside -q -f $testroot/share/test.sql > /dev/null
 fi
 
-echo "Installing new htpasswd."
-sudo cp $sharedir/htpasswd /usr/local/etc/freeside/htpasswd
-
 newtime=$(sudo -u freeside \
   psql -tc 'SELECT to_timestamp(max(_date) + 86400) FROM cust_bill' \
 )
-echo "Setting clock to $newtime."
-sudo date -s "$newtime"
+# no longer needed since we don't run LaTeX in the test script
+#echo "Setting clock to $newtime."
+#sudo date -s "$newtime"
 
 #echo "Applying upgrades."
 #sudo -u freeside freeside-upgrade test
@@ -58,6 +53,6 @@ sudo date -s "$newtime"
 
 # start Apache on a future date when all of the invoice dates are in the past
 echo "Restarting Apache."
-sudo service apache2 start
+sudo faketime "$newtime" apache2ctl start
 
 echo "Done."