X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS-Test%2Fbin%2Ffreeside-test-stop;h=6ec505a1f152c69f1425ed8956187830954eb6d8;hb=fe10e6c6a2e5de7a2ff468497790d2a317ec0c77;hp=2c62c10cdd8a2c0247e70ca1d23756258ad93bc2;hpb=f673db50d866ac1b64bb80b09bd81071d089bf41;p=freeside.git

diff --git a/FS-Test/bin/freeside-test-stop b/FS-Test/bin/freeside-test-stop
index 2c62c10cd..6ec505a1f 100755
--- a/FS-Test/bin/freeside-test-stop
+++ b/FS-Test/bin/freeside-test-stop
@@ -5,11 +5,12 @@ set -ae
 echo "Stopping Apache."
 sudo service apache2 stop
 
-echo "Resetting clock."
-sudo hwclock --hctosys
-
 newname=freeside_test_`date +%Y%m%d`
 if psql -l |grep -q '^ *freeside '; then
+  if psql -l |grep -q $newname; then
+    echo "Deleting old test database $newname."
+    dropdb "$newname"
+  fi
   echo "Renaming test database to $newname."
   psql postgres -c "ALTER DATABASE freeside RENAME TO $newname"
 fi
@@ -23,9 +24,6 @@ oldname=$( psql -tl | \
 if [ -n "$oldname" ]; then
   echo "Renaming $oldname to freeside."
   psql postgres -c "ALTER DATABASE $oldname RENAME TO freeside"
-  echo "Restarting services."
-  sudo service apache2 restart
-  sudo service freeside restart
 fi
 
 echo "Done."