[Fusionforge-commits] FusionForge branch master updated. 7c4ea0b089dbfb03fcfef7cf7f3cdccb08fe6c50

Roland Mas lolando at fusionforge.org
Tue Aug 12 09:54:12 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, master has been updated
       via  7c4ea0b089dbfb03fcfef7cf7f3cdccb08fe6c50 (commit)
       via  30dae1bcaa87f3265ef29d531ae7e66b9a8f5af4 (commit)
      from  b3bad23b14273ea85d0d8575d73ce0c3084f24ca (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 7c4ea0b089dbfb03fcfef7cf7f3cdccb08fe6c50
Merge: b3bad23 30dae1b
Author: Roland Mas <lolando at debian.org>
Date:   Tue Aug 12 09:54:06 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc tests/scripts/phpunit.sh
index 8cd4c4d,3a6a692..5c4e7fd
--- a/tests/scripts/phpunit.sh
+++ b/tests/scripts/phpunit.sh
@@@ -96,9 -96,23 +96,23 @@@ EO
  
  echo "Starting Selenium"
  killall -9 java
- PATH=/usr/lib/iceweasel:$PATH LANG=C java -jar /usr/share/selenium/selenium-server.jar -trustAllSSLCertificates -singleWindow >/dev/null &
- i=0
+ t=$(mktemp)
 -timeout=200
 +timeout=300
+ PATH=/usr/lib/iceweasel:$PATH LANG=C java -jar /usr/share/selenium/selenium-server.jar -trustAllSSLCertificates -singleWindow > $t 2>&1 &
+ i=0
+ while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 ; do
+     sleep 1
+     i=$(($i+1))
+ done
+ if [ $i = $timeout ] ; then
+     echo "Selenium failed to start within $timeout seconds:"
+     echo -----
+     cat $t
+     echo -----
+     echo "Trying again."
+ fi
+ PATH=/usr/lib/iceweasel:$PATH LANG=C java -jar /usr/share/selenium/selenium-server.jar -trustAllSSLCertificates -singleWindow > $t 2>&1 &
+ i=0
  while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 ; do
      sleep 1
      i=$(($i+1))

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

Summary of changes:
 tests/scripts/phpunit.sh |   24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list