projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e41f280
)
testsuite: attempt for quicker apache shutdown (esp. on CentOS)
author
Sylvain Beucler
<sylvain.beucler@inria.fr>
Tue, 8 Sep 2015 15:39:41 +0000
(17:39 +0200)
committer
Sylvain Beucler
<sylvain.beucler@inria.fr>
Tue, 8 Sep 2015 15:39:41 +0000
(17:39 +0200)
tests/func/fixtures.sh
patch
|
blob
|
history
diff --git
a/tests/func/fixtures.sh
b/tests/func/fixtures.sh
index 31e6c62cb02cc4670e0e94b6899640bcf9f30046..f0433f24572a7b4633e60ec6cb04e075afe2c43b 100755
(executable)
--- 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