RT# 77160 - added date search on customer timespan report

[freeside.git] / FS-Test / bin / freeside-test-stop

diff --git a/FS-Test/bin/freeside-test-stop b/FS-Test/bin/freeside-test-stop
index 5066890..ad355c3 100755 (executable)
--- 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
@@ -21,7 +22,7 @@ if (sudo grep -q '^test:' /usr/local/etc/freeside/htpasswd); then
   oldhtpasswd=$( cd /usr/local/etc/freeside; \
                  ls |grep -P 'htpasswd_\d{8}' | \
                  sort -nr |head -1 )
-  if [ -f $oldhtpasswd ]; then
+  if [ -f /usr/local/etc/freeside/$oldhtpasswd ]; then
     echo "Renaming $oldhtpasswd to htpasswd."
     sudo mv /usr/local/etc/freeside/$oldhtpasswd \
       /usr/local/etc/freeside/htpasswd
@@ -37,9 +38,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."