[Fusionforge-commits] FusionForge branch GUM updated. a58f47ec294aff168e51a119aef11671b673ae4d

Sylvain Beucler beuc-inria at fusionforge.org
Fri Aug 29 18:42:09 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, GUM has been updated
       via  a58f47ec294aff168e51a119aef11671b673ae4d (commit)
      from  430ddd3182e61ff5e13f8a2b1e6e1b309b12ceba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a58f47ec294aff168e51a119aef11671b673ae4d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Aug 29 18:42:00 2014 +0200

    testsuite: more debugging

diff --git a/src/post-install.d/db/configure.sh b/src/post-install.d/db/configure.sh
index 55a87ee..bcf812a 100755
--- a/src/post-install.d/db/configure.sh
+++ b/src/post-install.d/db/configure.sh
@@ -52,6 +52,6 @@ else
     service postgresql reload
 fi
 if [ -x /bin/systemctl ]; then
-    sleep 1  # systemd's postgresql init scripts is stupidly async
+    sleep 5  # systemd's postgresql init scripts is stupidly async
     # if you have a better way that works across distros...
 fi
diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index e09416d..4f98c6c 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -50,6 +50,7 @@ start_database () {
         echo "...OK"
     else
         echo "... FAIL: database still down?"
+	ps fauxww
     fi
 }
 
@@ -63,6 +64,7 @@ start_apache () {
 # Backup the DB, so that it can be restored for the test suite
 # Usually called from install.sh right after the first install (clean DB)
 if [ "$1" = "--backup" ]; then
+    set -e
     forge_set_password admin myadmin
     su - postgres -c "pg_dumpall" > /root/dump
     su postgres -c 'psql -c CHECKPOINT'  # flush to disk

-----------------------------------------------------------------------

Summary of changes:
 src/post-install.d/db/configure.sh |    2 +-
 tests/func/db_reload.sh            |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list