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 a3d2a7d17d9f168ea3ec9f41e2d452e56ee50333 (commit)
via 84ab8d2403185eb0c7a19dad19dfdb694d9e423e (commit)
via de5f254a86f2c7a1a7c8816f8a9d07bbc87d37ff (commit)
via c8e3eecad28256b30517ec11707edd4ee24c0088 (commit)
via 140c64ee85c58dd89dcdedacb1b22debdbfa0fe8 (commit)
via 84d51af69ddaa24dd45b268aefc9ac1a92e60bc6 (commit)
via 110af94c6e3f0a584e08b90f868cb6c66e08f968 (commit)
via 77967db04dadac92ce0fd48fdf993859bd2b7e5f (commit)
via adf4089056a23751d9be601ce76b01f534874e32 (commit)
via 6649030dad5c53f02ae2b4055f93524f8842c9f8 (commit)
via 9637aadc8fa7db37a4298a7024db79a8d258bcab (commit)
via 14365b9288b2cba8d07451eeda2d88d24fec19be (commit)
via dad12bd7208e8c2605ebbe2af49230ce661074f7 (commit)
via f902d6ab0c58317d29d4c6395991362c9ee8abc4 (commit)
via 5865eef2fa49eef22cfb682091ee7f574dd931d2 (commit)
via 87c10d9a3edaad059cf2b24a8d34073e4f6e5b36 (commit)
via d11b0e991af9e6db999c31a854aa3cf4545f3c33 (commit)
via b3e9eb174c69eccc1d7c662018d7b796d421399b (commit)
via 393762c3b0e02f358d433bcdd6f852b0da1cd434 (commit)
via 1cdfd7a60d49a37091c75a0df9cb74fad9730a02 (commit)
via 2d24a0c5468fba729ecb9e12e3ff3c0ad6dda14d (commit)
via a822fd8908c0eb3d424b4ab41add3ff266dc8601 (commit)
via a34f1daff3a4a4e547e456eec85463682a22d13d (commit)
via cff8b24cd180024ec7fdd42cf2343f0ae51127f7 (commit)
via 04a091f691a952bfb3facad8ad061f91d1ed44dd (commit)
via 903d4384405853ec90d5c501a8598d60a5b4e8b5 (commit)
via 649b8844743ce0d7d852e1906547bc8d2b210499 (commit)
via 873605621e800711d6cc1c6a5df7bee0b669115e (commit)
via 2f5954d041397786e8650cfa0f26396a35c875ae (commit)
via b314778532bdcc08efb91041e7aa97561b0f6425 (commit)
via f80f937b2206fbfc5e15cfc01c14a3219e750fa5 (commit)
via 36c22b9744e1daec65e516176bb9223d3bac4dfd (commit)
via 37e80a43062ad0f47242a88e089fd40aa30d89c6 (commit)
via 2a8b3abcc86607843a2e7bc178e9fecfb5f4a7f7 (commit)
via aeba31541ac687e8437aeba2eef7cb0b5e1424a2 (commit)
via 0b45ae9ec0dff85dcda2dc53b2b779ecfe4dbac0 (commit)
from 883245db48717a888ddc8121b6fed7c1f3337aa6 (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=a3d2a7d17d9f168ea3ec9f41e2d452e56ee50333
commit a3d2a7d17d9f168ea3ec9f41e2d452e56ee50333
Merge: 883245d 84ab8d2
Author: Roland Mas <[email protected]>
Date: Wed Dec 9 16:50:06 2020 +0100
Merge branch '6.1' (testsuite update and fixes)
diff --cc autoinstall/install-src.sh
index a76d7fd,ff6861a..0f9a7ea
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -42,19 -42,9 +42,19 @@@ if [ -e /etc/debian_version ]; the
vsftpd \
fonts-dejavu-core
apt-get -y install mediawiki -t jessie-backports
+ elif grep -q ^9 /etc/debian_version; then
+ apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-text-captcha php-soap \
+ libapache2-mpm-itk libapache2-mod-svn \
+ libapache2-mod-php \
+ apache2 postgresql postgresql-contrib libnss-pgsql2
unscd \
+ cvs subversion viewvc python-pycurl libcgi-pm-perl git
mercurial bzr xinetd \
+ python-moinmoin libapache2-mod-wsgi python-psycopg2 \
+ unoconv poppler-utils dpkg-dev \
+ libmarkdown-php \
+ vsftpd \
+ fonts-dejavu-core mediawiki
else
- apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-soap \
- apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-soap php-mbstring php-pear \
- ca-certificates \
++ apt-get install -y make gettext php-cli php-pgsql
php-htmlpurifier php-http php-soap php-pear ca-certificates \
libapache2-mpm-itk libapache2-mod-svn \
libapache2-mod-php \
apache2 postgresql postgresql-contrib libnss-pgsql2
unscd \
@@@ -64,18 -54,10 +64,21 @@@
libmarkdown-php \
vsftpd \
fonts-dejavu-core mediawiki
+ pushd $(mktemp -d)
+ apt-get install -y wget php-pear
+ ptpver=1.2.1-2
+ wget
http://ftp.fr.debian.org/debian/pool/main/p/php-text-password/php-text-password_${ptpver}_all.deb
+ dpkg -i php-text-password_${ptpver}_all.deb
+ rm -f php-text-password_${ptpver}_all.deb
+ ptcver=1.0.2-4
+ wget
http://ftp.fr.debian.org/debian/pool/main/p/php-text-captcha/php-text-captcha_${ptcver}_all.deb
+ dpkg -i php-text-captcha_${ptcver}_all.deb
+ rm -f php-text-captcha_${ptcver}_all.deb
+ popd
fi
+ if ! pear list Text_CAPTCHA ; then
+ pear install Text_CAPTCHA
+ fi
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
diff --cc tests/func/SeleniumForge.php
index ba73dd5,b6c60eb..5ba4640
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@@ -606,10 -612,10 +612,10 @@@ abstract class FForge_SeleniumTestCase
return true;
}
- function isElementPresent($element) {
+ protected function isElementPresent($element) {
try {
if (preg_match('/^\/\/[a-z]/', $element)) {
- if ($this->byXPath($element) instanceof
PHPUnit\Extensions\Selenium2TestCase_Element) {
+ if ($this->byXPath($element) instanceof
PHPUnit\Extensions\Selenium2TestCase\Element) {
return true;
}
} elseif (preg_match('/^link=/', $element)) {
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 5 +-
src/bin/systasksd | 30 ++++++--
tests/buildbot/fusionforge-func_tests.sh | 2 +-
tests/code/syntax/SyntaxTest.php | 3 +-
tests/code_and_unit_tests.php | 8 +-
tests/func/10_Site/loginTest.php | 7 +-
tests/func/10_Site/projectsTest.php | 6 +-
tests/func/20_Docs/folderTest.php | 2 +-
tests/func/20_Trackers/trackersTest.php | 2 +-
tests/func/70_SOAP/soapTest.php | 4 +-
tests/func/SeleniumForge.php | 128 ++++++++++++++++---------------
tests/func_tests.php | 20 +----
tests/func_tests.sh | 15 ++--
tests/unit/common/account.php | 14 ++--
tests/unit/utils/HtmlPurifierTest.php | 2 +-
15 files changed, 131 insertions(+), 117 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
