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.1 has been updated
via adf4089056a23751d9be601ce76b01f534874e32 (commit)
from 6649030dad5c53f02ae2b4055f93524f8842c9f8 (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=adf4089056a23751d9be601ce76b01f534874e32
commit adf4089056a23751d9be601ce76b01f534874e32
Author: Roland Mas <[email protected]>
Date: Tue Dec 8 21:12:28 2020 +0100
Try fixing testsuite
diff --git a/tests/func_tests.sh b/tests/func_tests.sh
index b773797..6d0a368 100755
--- a/tests/func_tests.sh
+++ b/tests/func_tests.sh
@@ -101,7 +101,7 @@ install_selenium() {
GECKODRIVERMICRO=0
GECKODRIVERURL=https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVERMAJOR.$GECKODRIVERMINOR.$GECKODRIVERMICRO/geckodriver-v$GECKODRIVERMAJOR.$GECKODRIVERMINOR.$GECKODRIVERMICRO-linux64.tar.gz
mkdir -p /usr/share/geckodriver/
- rm -f /usr/share/geckodriver/geckodriver*
+ rm -f /usr/share/geckodriver/geckodriver
http_proxy=$PROXY wget -c $GECKODRIVERURL \
-O /usr/share/geckodriver/geckodriver.tar.gz
@@ -268,7 +268,10 @@ else
phpunit=phpunit
fi
-timeout 2h $phpunit --verbose --debug --stop-on-failure --log-junit
$SELENIUM_RC_DIR/phpunit-selenium.xml $testname || retcode=$?
+# For some reason PHPunit thinks all methods are tests
+# …hence the --filter ::test to enforce that
+# otherwise shared methods such as login() and logout() are run like tests and
fail
+timeout 2h $phpunit --filter ::test --verbose --debug --stop-on-failure
--log-junit $SELENIUM_RC_DIR/phpunit-selenium.xml $testname || retcode=$?
set +x
echo "phpunit returned with code $retcode"
-----------------------------------------------------------------------
Summary of changes:
tests/func_tests.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
