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 e7a232a39077e4dd901602cdf3cb1fb133725050 (commit)
from db4597ad95d0669ec4c858a253697c6cea1e537c (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=e7a232a39077e4dd901602cdf3cb1fb133725050
commit e7a232a39077e4dd901602cdf3cb1fb133725050
Author: Franck Villaume <[email protected]>
Date: Sun Jan 6 18:57:51 2019 +0100
include lot of fixes & start to try to make it work with selenium 3.8.1 &
latest firefox...
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index de39693..d76afc6 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -52,12 +52,14 @@ esac
fix_httpd_itk() {
case $INSTALL_OS in
centos*)
- echo 'WARNING: WORKAROUND for docker/lxc. Downgrade
httpd-itk.'
- echo 'TODO: check for newer version. Debian not
impacted.'
- curl
https://kojipkgs.fedoraproject.org//packages/httpd-itk/2.4.7.04/1.el7/x86_64/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
-o /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
- yum downgrade -y
/tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
- rm -f /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
- service httpd restart || true
+ if [[ `rpm -qi httpd-itk | grep Release | awk '{print
$3}'` != '1.el7' ]]; then
+ echo 'WARNING: WORKAROUND for docker/lxc.
Downgrade httpd-itk.'
+ echo 'TODO: check for newer version. Debian not
impacted.'
+ curl
https://kojipkgs.fedoraproject.org//packages/httpd-itk/2.4.7.04/1.el7/x86_64/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
-o /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ yum downgrade -y
/tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ rm -f /tmp/httpd-itk-2.4.7.04-1.el7.x86_64.rpm
+ service httpd restart || true
+ fi
;;
esac
}
@@ -67,12 +69,12 @@ install_selenium() {
# psmisc for db_reload.sh:killall
# rsyslog to get e.g. sshd error log
if [ -e /etc/debian_version ]; then
- ICEWEASEL_VERSION=`apt-cache show firefox-esr | grep Version |
grep -v '60' | cut -f 2 -d' '`
- apt-get -y install wget default-jre
firefox-esr=$ICEWEASEL_VERSION
+ apt-get -y install wget firefox-esr net-tools
if grep -q ^8 /etc/debian_version; then
apt-get -y install phpunit phpunit-selenium patch psmisc
patch rsyslog
+ apt-get -y install -t jessie-backports openjdk-8-jdk
else
- apt-get -y install php-curl unzip composer patch psmisc
patch rsyslog
+ apt-get -y install php-curl unzip composer patch psmisc
patch rsyslog default-jre
mkdir -p /usr/local/share/php
pushd /usr/local/share/php
composer --no-plugins --no-scripts require phpunit/phpunit
@@ -81,19 +83,13 @@ install_selenium() {
fi
else
yum -y install wget firefox
- if yum list java-1.7.0-openjdk >/dev/null 2>&1 ; then
- yum install -y java-1.7.0-openjdk
- else
- yum install -y java-1.6.0
- fi
+ yum install -y java-1.8.0-openjdk
yum --enablerepo=epel install -y php-phpunit-PHPUnit
php-phpunit-PHPUnit-Selenium psmisc patch net-tools
- # Firefox > 60 does not work with Selenium 2
- yum downgrade -y firefox-52.8.0-1.el7.centos
fi
# Install selenium (no packaged version available)
- SELENIUMMAJOR=2
- SELENIUMMINOR=53
+ SELENIUMMAJOR=3
+ SELENIUMMINOR=8
SELENIUMMICRO=1
SELENIUMURL=http://selenium-release.storage.googleapis.com/$SELENIUMMAJOR.$SELENIUMMINOR/selenium-server-standalone-$SELENIUMMAJOR.$SELENIUMMINOR.$SELENIUMMICRO.jar
mkdir -p /usr/share/selenium/
@@ -199,7 +195,7 @@ EOF
echo "Starting Selenium"
killall -9 java || true
timeout=60
-PATH=/usr/lib/iceweasel:/usr/lib/firefox-esr:/usr/lib64/firefox:$PATH LANG=C
java -jar /usr/share/selenium/selenium-server.jar -trustAllSSLCertificates
-singleWindow &
+PATH=/usr/lib/iceweasel:/usr/lib/firefox-esr:/usr/lib64/firefox:$PATH LANG=C
java -jar /usr/share/selenium/selenium-server.jar -enablePassThrough false &
pid=$!
i=0
while [ $i -lt $timeout ] && ! netstat -tnl 2>/dev/null | grep -q :4444 &&
kill -0 $pid 2>/dev/null; do
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
