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 96d6f4786472c5f58edb5559ee71baeb12e16cac (commit)
from 9c358ab50cf48966d390426fe7c10124a4bc7cdf (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 96d6f4786472c5f58edb5559ee71baeb12e16cac
Author: Roland Mas <[email protected]>
Date: Wed Apr 8 14:11:59 2015 +0200
Generate entropy for Selenium if it fails to start its listener (it seems
to be blocking on reads from /dev/random)
diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index 6b5f621..b53d5ce 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -138,6 +138,16 @@ while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null |
grep -q :4444 && kill
sleep 1
i=$(($i+1))
done
+if [ $i = $timeout ]; then
+ echo "Selenium failed to start listener… lacking entropy? Trying again."
+ find / > /dev/null 2> /dev/null &
+ i=0
+ while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 &&
kill -0 $pid 2>/dev/null; do
+ echo "Waiting for Selenium..."
+ sleep 1
+ i=$(($i+1))
+ done
+fi
if [ $i = $timeout ] || ! kill -0 $pid 2>/dev/null; then
echo "Selenium failed to start!"
netstat -tnl
-----------------------------------------------------------------------
Summary of changes:
tests/func/phpunit-selenium.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
