[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-81-g7f6eacf

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Tue Sep 8 17:39:47 CEST 2015


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  7f6eacf23bef06b59b78449adb02daa7b1fe2ba3 (commit)
      from  e41f2800f279a3a91c1772a07f5d3ccbff1b8aea (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=7f6eacf23bef06b59b78449adb02daa7b1fe2ba3

commit 7f6eacf23bef06b59b78449adb02daa7b1fe2ba3
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 8 17:39:41 2015 +0200

    testsuite: attempt for quicker apache shutdown (esp. on CentOS)

diff --git a/tests/func/fixtures.sh b/tests/func/fixtures.sh
index 31e6c62..f0433f2 100755
--- a/tests/func/fixtures.sh
+++ b/tests/func/fixtures.sh
@@ -17,6 +17,10 @@ is_db_down () {
 }
 
 stop_apache () {
+    if [ "$1" = "--force" ]; then
+	# We don't care about data integrity, we're resetting it
+	killall -9 $(forge_get_config apache_service)
+    fi
     echo "Stopping apache"
     service $(forge_get_config apache_service) stop
 }
@@ -152,7 +156,7 @@ fi
 # Else, restore clean state
 
 service fusionforge-systasksd stop
-stop_apache
+stop_apache --force
 stop_database --force
 
 # SCM

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

Summary of changes:
 tests/func/fixtures.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list