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, 6.0 has been updated
via 145b928749c17ad981ce8a76f738335a0c55dc7a (commit)
from 9a852b322a9274301360d83dee14ce5c07ae63cb (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=145b928749c17ad981ce8a76f738335a0c55dc7a
commit 145b928749c17ad981ce8a76f738335a0c55dc7a
Author: Sylvain Beucler <[email protected]>
Date: Fri Nov 6 14:47:27 2015 +0100
testsuite: avoid 'Unable to connect' errors when apache2 is delayed-stopped
by systemd & al. and then isn't restarted
diff --git a/tests/func/fixtures.sh b/tests/func/fixtures.sh
index a75184e..cb8f899 100755
--- a/tests/func/fixtures.sh
+++ b/tests/func/fixtures.sh
@@ -126,7 +126,7 @@ fi
if [ "$reset" = 1 ]; then
set -e
# Reset connections
- stop_apache
+ stop_apache --force
service fusionforge-systasksd stop
service postgresql restart
su - postgres -c "dropdb $database" || true
@@ -142,7 +142,7 @@ fi
if [ "$backup" = 1 ]; then
set -e
su - postgres -c 'psql -c CHECKPOINT' # flush to disk
- stop_apache
+ stop_apache --force
stop_database
rm -fr $pgdir.backup-$fixture/*
# support /var/lib/pgsql as a symlink to tmpfs
-----------------------------------------------------------------------
Summary of changes:
tests/func/fixtures.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
