[Fusionforge-commits] FusionForge branch master updated. bb09ba01f4e4e0bf3420c219203c47ac7fd1735d
Roland Mas
lolando at fusionforge.org
Wed May 7 14:28:39 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 bb09ba01f4e4e0bf3420c219203c47ac7fd1735d (commit)
via fd001b942dbed898030a03adfe916ded190d95b0 (commit)
via e7d97092853e14d95374fb22679b1bfd9908690b (commit)
via 1ec852e8cb231cfc451348631db051a66d0b1319 (commit)
via 65ddeaa02b5b83de925126876fd7119b0d379640 (commit)
via 2e2b90514ac01f2bd9e442516a4d20d8e26d86eb (commit)
via 073973c515048044ce4af0dc50cad0088cb880bb (commit)
via cdfc355c899d25e39bc76f66db46073ccab9229f (commit)
via 7aba7f0e8a4cc2a3df012253ca59a641c08e57aa (commit)
via abb9a63ab96e1438ff0f3e9b2cdf0c8549ea507b (commit)
from 5e8f30be93321477b06aa40de5409cf8c80aec71 (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 bb09ba01f4e4e0bf3420c219203c47ac7fd1735d
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 14:28:18 2014 +0200
Removed +x bit from files that don't need it
diff --git a/tests/func/AllTests.php b/tests/func/AllTests.php
old mode 100755
new mode 100644
diff --git a/tests/func/Forums/forumsTest.php b/tests/func/Forums/forumsTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/News/newsTest.php b/tests/func/News/newsTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/Site/loginTest.php b/tests/func/Site/loginTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/Site/projectsTest.php b/tests/func/Site/projectsTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/Site/topTest.php b/tests/func/Site/topTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/Trackers/trackersTest.php b/tests/func/Trackers/trackersTest.php
old mode 100755
new mode 100644
diff --git a/tests/func/config.php.buildbot b/tests/func/config.php.buildbot
old mode 100755
new mode 100644
diff --git a/tests/func/config.php.sample b/tests/func/config.php.sample
old mode 100755
new mode 100644
diff --git a/tests/func/config.php.tests b/tests/func/config.php.tests
old mode 100755
new mode 100644
commit fd001b942dbed898030a03adfe916ded190d95b0
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 14:27:38 2014 +0200
Remove explicit list of tests
diff --git a/tests/Testsuite.php b/tests/Testsuite.php
index 71a27f3..aa6e8ac 100644
--- a/tests/Testsuite.php
+++ b/tests/Testsuite.php
@@ -23,23 +23,7 @@ class Testsuite
// Selenium tests
if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
- $suite->addTestFiles(glob("func/Site/*Test.php"));
- $suite->addTestFiles(glob("func/Trackers/*Test.php"));
- $suite->addTestFiles(glob("func/Tasks/*Test.php"));
- $suite->addTestFiles(glob("func/Docs/*Test.php"));
- $suite->addTestFiles(glob("func/Forums/*Test.php"));
- $suite->addTestFiles(glob("func/News/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
- $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmGit/*WUITest.php"));
- $suite->addTestFiles(glob("func/PluginsScmSvn/*WUITest.php"));
- $suite->addTestFiles(glob("func/RBAC/*Test.php"));
- $suite->addTestFiles(glob("func/Surveys/*Test.php"));
- $suite->addTestFiles(glob("func/Search/*Test.php"));
+ $suite->addTestFiles(glob("func/*/*Test.php"));
return $suite;
}
commit e7d97092853e14d95374fb22679b1bfd9908690b
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 14:24:49 2014 +0200
Adjust two skips
diff --git a/tests/func/PluginsScmBzr/bzrTest.php b/tests/func/PluginsScmBzr/bzrTest.php
index 3b71a85..8ef2cac 100644
--- a/tests/func/PluginsScmBzr/bzrTest.php
+++ b/tests/func/PluginsScmBzr/bzrTest.php
@@ -26,7 +26,7 @@ class ScmBzrTest extends FForge_SeleniumTestCase
function testScmBzr()
{
$this->skip_on_rpm_installs();
- $this->skip_on_centos();
+ $this->skip_on_src_installs();
$this->activatePlugin('scmbzr');
$this->populateStandardTemplate('empty');
diff --git a/tests/func/PluginsScmGit/gitWUITest.php b/tests/func/PluginsScmGit/gitWUITest.php
index 704ef36..462e07c 100644
--- a/tests/func/PluginsScmGit/gitWUITest.php
+++ b/tests/func/PluginsScmGit/gitWUITest.php
@@ -25,6 +25,8 @@ class ScmGitWUITest extends FForge_SeleniumTestCase
{
function testScmGitWUI()
{
+ $this->skip_on_src_installs();
+
$this->activatePlugin('scmgit');
$this->populateStandardTemplate('empty');
$this->init();
commit 1ec852e8cb231cfc451348631db051a66d0b1319
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 14:01:44 2014 +0200
Update VM script to use current testsuite system
diff --git a/vm/scripts/run-testsuite.sh b/vm/scripts/run-testsuite.sh
index 1d5d08d..ec669b9 100755
--- a/vm/scripts/run-testsuite.sh
+++ b/vm/scripts/run-testsuite.sh
@@ -27,4 +27,4 @@ aptitude -y install php5-cli phpunit phpunit-selenium
#fi
# Now, start the functionnal test suite using phpunit and selenium
-/usr/src/fusionforge/tests/scripts/phpunit.sh Testsuite-deb.php
+/usr/src/fusionforge/tests/scripts/phpunit.sh deb/debian
commit 65ddeaa02b5b83de925126876fd7119b0d379640
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 14:01:06 2014 +0200
Removed obsolete files
diff --git a/tests/Testsuite-common.php b/tests/Testsuite-common.php
deleted file mode 100644
index 42f6000..0000000
--- a/tests/Testsuite-common.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-if (!@include_once 'PHPUnit/Autoload.php') {
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-
-require_once 'func/Testing/SeleniumRemoteSuite.php';
-
-class TestsuiteCommon
-{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-}
diff --git a/tests/Testsuite-deb.php b/tests/Testsuite-deb.php
deleted file mode 100644
index 4cfc56d..0000000
--- a/tests/Testsuite-deb.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-require_once 'TestsuiteCommon.php';
-
-class TestsuiteDeb extends TestsuiteCommon
-{
- public static function suite()
- {
- $suite = new SeleniumRemoteSuite('PHPUnit');
-
- // Selenium tests
- if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
- $suite->addTestFiles(glob("func/Site/*Test.php"));
- $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/Trackers/*Test.php"));
- $suite->addTestFiles(glob("func/Tasks/*Test.php"));
- $suite->addTestFiles(glob("func/Docs/*Test.php"));
- $suite->addTestFiles(glob("func/Forums/*Test.php"));
- $suite->addTestFiles(glob("func/News/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
- $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmGit/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmSvn/*Test.php"));
- $suite->addTestFiles(glob("func/RBAC/*Test.php"));
- $suite->addTestFiles(glob("func/Surveys/*Test.php"));
- $suite->addTestFiles(glob("func/Search/*Test.php"));
-
- return $suite;
- }
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
- AllTests::main();
-}
diff --git a/tests/Testsuite-rpm.php b/tests/Testsuite-rpm.php
deleted file mode 100644
index 10a4e56..0000000
--- a/tests/Testsuite-rpm.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-require_once 'TestsuiteCommon.php';
-
-class TestsuiteRPM extends TestsuiteCommon
-{
- public static function suite()
- {
- $suite = new SeleniumRemoteSuite('PHPUnit');
-
- // Selenium tests
- $suite->addTestFiles(glob("func/Site/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/Trackers/*Test.php"));
- $suite->addTestFiles(glob("func/Tasks/*Test.php"));
- $suite->addTestFiles(glob("func/Docs/*Test.php"));
- $suite->addTestFiles(glob("func/Forums/*Test.php"));
- $suite->addTestFiles(glob("func/News/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmGit/gitWUITest.php"));
- $suite->addTestFiles(glob("func/PluginsScmSvn/svnWUITest.php"));
- $suite->addTestFiles(glob("func/RBAC/*Test.php"));
- $suite->addTestFiles(glob("func/Surveys/*Test.php"));
- $suite->addTestFiles(glob("func/Search/*Test.php"));
-
- return $suite;
- }
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
- AllTests::main();
-}
diff --git a/tests/Testsuite-src-cos.php b/tests/Testsuite-src-cos.php
deleted file mode 100644
index d59544e..0000000
--- a/tests/Testsuite-src-cos.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-require_once 'TestsuiteCommon.php';
-
-class TestsuiteSrcCOS extends TestsuiteCommon
-{
- public static function suite()
- {
- $suite = new SeleniumRemoteSuite('PHPUnit');
-
- // Selenium tests
- $suite->addTestFiles(glob("func/Site/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/Trackers/*Test.php"));
- $suite->addTestFiles(glob("func/Tasks/*Test.php"));
- $suite->addTestFiles(glob("func/Docs/*Test.php"));
- $suite->addTestFiles(glob("func/Forums/*Test.php"));
- $suite->addTestFiles(glob("func/News/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmGit/gitWUITest.php"));
- $suite->addTestFiles(glob("func/PluginsScmSvn/svnWUITest.php"));
- $suite->addTestFiles(glob("func/RBAC/*Test.php"));
- $suite->addTestFiles(glob("func/Surveys/*Test.php"));
- $suite->addTestFiles(glob("func/Search/*Test.php"));
-
- return $suite;
- }
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
- AllTests::main();
-}
diff --git a/tests/Testsuite-src-deb.php b/tests/Testsuite-src-deb.php
deleted file mode 100644
index 80b4bd0..0000000
--- a/tests/Testsuite-src-deb.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-require_once 'TestsuiteCommon.php';
-
-class TestsuiteSrcDeb extends TestsuiteCommon
-{
- public static function suite()
- {
- $suite = new SeleniumRemoteSuite('PHPUnit');
-
- // Selenium tests
- if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
- $suite->addTestFiles(glob("func/Site/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
- $suite->addTestFiles(glob("func/Trackers/*Test.php"));
- $suite->addTestFiles(glob("func/Tasks/*Test.php"));
- $suite->addTestFiles(glob("func/Docs/*Test.php"));
- $suite->addTestFiles(glob("func/Forums/*Test.php"));
- $suite->addTestFiles(glob("func/News/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
-// $suite->addTestFiles(glob("func/SSH/*Test.php"));
-// $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
- $suite->addTestFiles(glob("func/PluginsScmGit/gitWUITest.php"));
- $suite->addTestFiles(glob("func/PluginsScmSvn/svnWUITest.php"));
- $suite->addTestFiles(glob("func/RBAC/*Test.php"));
- $suite->addTestFiles(glob("func/Surveys/*Test.php"));
- $suite->addTestFiles(glob("func/Search/*Test.php"));
-
- return $suite;
- }
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
- AllTests::main();
-}
diff --git a/tests/Testsuite.php b/tests/Testsuite.php
index 5bdcbd3..71a27f3 100644
--- a/tests/Testsuite.php
+++ b/tests/Testsuite.php
@@ -1,9 +1,22 @@
<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+ define('PHPUnit_MAIN_METHOD', 'AllTests::main');
+}
+
+if (!@include_once 'PHPUnit/Autoload.php') {
+ include_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+}
-require_once 'TestsuiteCommon.php';
+require_once 'func/Testing/SeleniumRemoteSuite.php';
-class Testsuite extends TestsuiteCommon
+class Testsuite
{
+ public static function main()
+ {
+ PHPUnit_TextUI_TestRunner::run(self::suite());
+ }
+
public static function suite()
{
$suite = new SeleniumRemoteSuite('PHPUnit');
commit 2e2b90514ac01f2bd9e442516a4d20d8e26d86eb
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 13:55:55 2014 +0200
Declare which tests need to be skipped inside each test, and unify testsuite definition file
diff --git a/tests/Testsuite.php b/tests/Testsuite.php
new file mode 100644
index 0000000..5bdcbd3
--- /dev/null
+++ b/tests/Testsuite.php
@@ -0,0 +1,37 @@
+<?php
+
+require_once 'TestsuiteCommon.php';
+
+class Testsuite extends TestsuiteCommon
+{
+ public static function suite()
+ {
+ $suite = new SeleniumRemoteSuite('PHPUnit');
+
+ // Selenium tests
+ if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
+ $suite->addTestFiles(glob("func/Site/*Test.php"));
+ $suite->addTestFiles(glob("func/Trackers/*Test.php"));
+ $suite->addTestFiles(glob("func/Tasks/*Test.php"));
+ $suite->addTestFiles(glob("func/Docs/*Test.php"));
+ $suite->addTestFiles(glob("func/Forums/*Test.php"));
+ $suite->addTestFiles(glob("func/News/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsBlocks/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsMediawiki/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsMoinMoin/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsOnlineHelp/*Test.php"));
+ $suite->addTestFiles(glob("func/SSH/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsScmBzr/*Test.php"));
+ $suite->addTestFiles(glob("func/PluginsScmGit/*WUITest.php"));
+ $suite->addTestFiles(glob("func/PluginsScmSvn/*WUITest.php"));
+ $suite->addTestFiles(glob("func/RBAC/*Test.php"));
+ $suite->addTestFiles(glob("func/Surveys/*Test.php"));
+ $suite->addTestFiles(glob("func/Search/*Test.php"));
+
+ return $suite;
+ }
+}
+
+if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
+ AllTests::main();
+}
diff --git a/tests/func/PluginsMediawiki/mediawikiTest.php b/tests/func/PluginsMediawiki/mediawikiTest.php
index 4dd1a03..de6dfce 100644
--- a/tests/func/PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/PluginsMediawiki/mediawikiTest.php
@@ -27,6 +27,9 @@ class PluginMediawiki extends FForge_SeleniumTestCase
function testMediawiki()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_centos();
+
$this->activatePlugin('mediawiki');
$this->populateStandardTemplate('empty');
diff --git a/tests/func/PluginsMoinMoin/moinmoinTest.php b/tests/func/PluginsMoinMoin/moinmoinTest.php
index 1f595fc..e953a93 100644
--- a/tests/func/PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/PluginsMoinMoin/moinmoinTest.php
@@ -27,6 +27,9 @@ class PluginMoinMoin extends FForge_SeleniumTestCase
function testMoinMoin()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_centos();
+
$this->activatePlugin('moinmoin');
$this->populateStandardTemplate('empty');
diff --git a/tests/func/PluginsOnlineHelp/contextualHelpTest.php b/tests/func/PluginsOnlineHelp/contextualHelpTest.php
index 5cb19c5..319253e 100644
--- a/tests/func/PluginsOnlineHelp/contextualHelpTest.php
+++ b/tests/func/PluginsOnlineHelp/contextualHelpTest.php
@@ -47,6 +47,8 @@ class ContextualHelp extends FForge_SeleniumTestCase
{
function testContextualHelp()
{
+ $this->skip_on_debian();
+
$this->init();
$this->activatePlugin('online_help');
$this->login ('admin');
diff --git a/tests/func/PluginsScmBzr/bzrTest.php b/tests/func/PluginsScmBzr/bzrTest.php
index ec9db7b..3b71a85 100644
--- a/tests/func/PluginsScmBzr/bzrTest.php
+++ b/tests/func/PluginsScmBzr/bzrTest.php
@@ -25,6 +25,9 @@ class ScmBzrTest extends FForge_SeleniumTestCase
{
function testScmBzr()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_centos();
+
$this->activatePlugin('scmbzr');
$this->populateStandardTemplate('empty');
$this->init();
diff --git a/tests/func/PluginsScmGit/gitSSHTest.php b/tests/func/PluginsScmGit/gitSSHTest.php
index e5fc4f5..df1ebf2 100644
--- a/tests/func/PluginsScmGit/gitSSHTest.php
+++ b/tests/func/PluginsScmGit/gitSSHTest.php
@@ -25,6 +25,9 @@ class ScmGitSSHTest extends FForge_SeleniumTestCase
{
function testScmGitSSH()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_src_installs();
+
$this->activatePlugin('scmgit');
$this->populateStandardTemplate('empty');
$this->init();
diff --git a/tests/func/PluginsScmSvn/svnSSHTest.php b/tests/func/PluginsScmSvn/svnSSHTest.php
index 36b0f8b..6c4fd0d 100644
--- a/tests/func/PluginsScmSvn/svnSSHTest.php
+++ b/tests/func/PluginsScmSvn/svnSSHTest.php
@@ -25,6 +25,9 @@ class ScmSvnSSHTest extends FForge_SeleniumTestCase
{
function testScmSvnSSH()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_src_installs();
+
$this->activatePlugin('scmsvn');
$this->populateStandardTemplate('empty');
$this->init();
diff --git a/tests/func/SSH/sshTest.php b/tests/func/SSH/sshTest.php
index 5891ee6..45e5e2a 100644
--- a/tests/func/SSH/sshTest.php
+++ b/tests/func/SSH/sshTest.php
@@ -25,6 +25,9 @@ class SSHTest extends FForge_SeleniumTestCase
{
function testSSH()
{
+ $this->skip_on_rpm_installs();
+ $this->skip_on_src_installs();
+
$this->init();
$this->uploadSshKey();
diff --git a/tests/func/Testing/SeleniumGforge.php b/tests/func/Testing/SeleniumGforge.php
index 53ac75e..c566fdf 100644
--- a/tests/func/Testing/SeleniumGforge.php
+++ b/tests/func/Testing/SeleniumGforge.php
@@ -445,6 +445,36 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
$this->type("authorized_key", $k);
$this->clickAndWait("submit");
}
+
+ protected function skip_on_rpm_installs($msg='Skipping on installations from RPM') {
+ if (INSTALL_METHOD == 'rpm') {
+ $this->markTestSkipped($msg);
+ }
+ }
+
+ protected function skip_on_deb_installs($msg='Skipping on installations from *.deb') {
+ if (INSTALL_METHOD == 'deb') {
+ $this->markTestSkipped($msg);
+ }
+ }
+
+ protected function skip_on_src_installs($msg='Skipping on installations from *.deb') {
+ if (INSTALL_METHOD == 'src') {
+ $this->markTestSkipped($msg);
+ }
+ }
+
+ protected function skip_on_centos($msg='Skipping on CentOS platforms') {
+ if (INSTALL_OS == 'centos') {
+ $this->markTestSkipped($msg);
+ }
+ }
+
+ protected function skip_on_debian($msg='Skipping on Debian platforms') {
+ if (INSTALL_OS == 'debian') {
+ $this->markTestSkipped($msg);
+ }
+ }
}
// Local Variables:
diff --git a/tests/func/vncxstartsuite.sh b/tests/func/vncxstartsuite.sh
index cc0385c..4b9c4da 100755
--- a/tests/func/vncxstartsuite.sh
+++ b/tests/func/vncxstartsuite.sh
@@ -1,14 +1,14 @@
#! /bin/sh
-TEST_SUITE="$1"
+TEST_ENV="$1"
# Test arg
-if [ -z "$TEST_SUITE" ]
+if [ -z "$TEST_ENV" ]
then
- echo "Usage : $0 <TEST_SUITE>"
+ echo "Usage: $0 <TEST_ENV>"
+ echo " examples: src/debian, deb/debian, rpm/centos"
exit 1
fi
-TEST_ENV="$2"
INSTALL_METHOD=${TEST_ENV%/*}
INSTALL_OS=${TEST_ENV#*/}
@@ -16,12 +16,6 @@ INSTALL_OS=${TEST_ENV#*/}
relativescriptpath=`dirname $0`
TEST_HOME=$(cd $relativescriptpath/..;pwd)
-if [ ! -f "$TEST_HOME/$TEST_SUITE" ]
-then
- echo "Test suite $TEST_SUITE not found"
- exit 2
-fi
-
# Check vncserver
if ! type vncserver 2>/dev/null
then
@@ -50,7 +44,7 @@ fi
cat > /root/.vnc/xstartup<<EOF
#! /bin/bash
: > /root/phpunit.exitcode
-INSTALL_METHOD=$INSTALL_METHOD INSTALL_OS=$INSTALL_OS $TEST_HOME/scripts/phpunit.sh $TEST_SUITE &> /var/log/phpunit.log &
+INSTALL_METHOD=$INSTALL_METHOD INSTALL_OS=$INSTALL_OS $TEST_HOME/scripts/phpunit.sh &> /var/log/phpunit.log &
echo \$! > /root/phpunit.pid
wait %1
echo \$? > /root/phpunit.exitcode
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 58082cf..adde7f3 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -23,7 +23,7 @@ case $HOST in
;;
esac
-export FILTER="Testsuite-deb.php"
+export FILTER="deb/debian"
prepare_workspace
@@ -159,7 +159,7 @@ EOF
# Run tests
retcode=0
echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER deb/deb" || retcode=$?
+ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER" || retcode=$?
rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
cd $CHECKOUTPATH
diff --git a/tests/scripts/fusionforge-build-and-test-rpm.sh b/tests/scripts/fusionforge-build-and-test-rpm.sh
index ad447a7..75f9541 100755
--- a/tests/scripts/fusionforge-build-and-test-rpm.sh
+++ b/tests/scripts/fusionforge-build-and-test-rpm.sh
@@ -6,7 +6,8 @@ get_config
export FORGE_HOME=/usr/share/gforge
export HOST=$1
-export FILTER="Testsuite-rpm.php"
+
+export FILTER="rpm/centos"
case $HOST in
centos5.local)
@@ -85,7 +86,7 @@ EOF
# Run tests
retcode=0
echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER"
+ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh rpm/centos"
retcode=$?
rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
scp root@$HOST:/tmp/gforge-*.log $WORKSPACE/reports/
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index ea3be62..9a02af9 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -6,7 +6,8 @@ get_config
export FORGE_HOME=/opt/gforge
export HOST=$1
-export FILTER="Testsuite-src-cos.php"
+
+export FILTER="src/centos"
case $HOST in
centos5.local)
@@ -78,7 +79,7 @@ EOF
# Run tests
retcode=0
echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER" || retcode=$?
+ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh src/centos" || retcode=$?
rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
scp root@$HOST:/tmp/gforge-*.log $WORKSPACE/reports/
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index dd9da3c9..47fd333 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -19,7 +19,7 @@ case $HOST in
;;
esac
-export FILTER="Testsuite-src-deb.php"
+export FILTER="src/debian"
get_config $@
prepare_workspace
@@ -63,7 +63,7 @@ EOF
# Run tests
retcode=0
echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER"
+ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh src/debian"
retcode=$?
rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
diff --git a/tests/scripts/phpunit.sh b/tests/scripts/phpunit.sh
index c24649e..68b7d3a 100755
--- a/tests/scripts/phpunit.sh
+++ b/tests/scripts/phpunit.sh
@@ -1,19 +1,10 @@
#! /bin/sh
-if [ $# -ge 1 ]
-then
- testsuite=$1
- shift
-else
- echo "You must give the testsuite to run :"
- echo " - DEBDebian70Tests.php"
- echo " - RPMCentosTests.php"
- echo " - TarCentosTests.php"
-fi
-if [ "x$testsuite" = "x" ]
-then
- echo "Forge test suite not found"
- exit 1
+INSTALL_METHOD=$INSTALL_METHOD INSTALL_OS=$INSTALL_OS
+
+if [ -z "$INSTALL_METHOD" ] || [ -z "$INSTALL_OS" ] ; then
+ echo INSTALL_METHOD and INSTALL_OS required
+ echo Example: INSTALL_METHOD=src INSTALL_OS=centos $0
fi
scriptdir=$(dirname $0)
@@ -117,10 +108,10 @@ if [ $i = $timeout ] ; then
exit 1
fi
-echo "Running PHPunit tests from $testsuite"
+echo "Running PHPunit tests"
retcode=0
cd tests
-phpunit --verbose --stop-on-failure --log-junit $SELENIUM_RC_DIR/phpunit-selenium.xml $@ $testsuite || retcode=$?
+phpunit --verbose --stop-on-failure --log-junit $SELENIUM_RC_DIR/phpunit-selenium.xml $@ Testsuite.php || retcode=$?
cd ..
# on debian
killall -9 firefox-bin
commit 073973c515048044ce4af0dc50cad0088cb880bb
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 13:26:07 2014 +0200
Export installation method and target OS to testsuite
diff --git a/tests/func/vncxstartsuite.sh b/tests/func/vncxstartsuite.sh
index baab2f2..cc0385c 100755
--- a/tests/func/vncxstartsuite.sh
+++ b/tests/func/vncxstartsuite.sh
@@ -8,6 +8,10 @@ then
exit 1
fi
+TEST_ENV="$2"
+INSTALL_METHOD=${TEST_ENV%/*}
+INSTALL_OS=${TEST_ENV#*/}
+
# Find $TEST_HOME
relativescriptpath=`dirname $0`
TEST_HOME=$(cd $relativescriptpath/..;pwd)
@@ -46,7 +50,7 @@ fi
cat > /root/.vnc/xstartup<<EOF
#! /bin/bash
: > /root/phpunit.exitcode
-$TEST_HOME/scripts/phpunit.sh $TEST_SUITE &> /var/log/phpunit.log &
+INSTALL_METHOD=$INSTALL_METHOD INSTALL_OS=$INSTALL_OS $TEST_HOME/scripts/phpunit.sh $TEST_SUITE &> /var/log/phpunit.log &
echo \$! > /root/phpunit.pid
wait %1
echo \$? > /root/phpunit.exitcode
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 8a7435b..58082cf 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -159,7 +159,7 @@ EOF
# Run tests
retcode=0
echo "Run phpunit test on $HOST in $FORGE_HOME"
-ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER" || retcode=$?
+ssh root@$HOST "$FORGE_HOME/tests/func/vncxstartsuite.sh $FILTER deb/deb" || retcode=$?
rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
cd $CHECKOUTPATH
diff --git a/tests/scripts/phpunit.sh b/tests/scripts/phpunit.sh
index ac4e8bd..c24649e 100755
--- a/tests/scripts/phpunit.sh
+++ b/tests/scripts/phpunit.sh
@@ -69,7 +69,10 @@ if (is_executable ("$FORGE_HOME/bin/forge_run_job")) {
} else {
print "Neither $FORGE_HOME/bin/forge_run_job, nor $FORGE_HOME/utils/forge_run_job, nor $FORGE_HOME/src/utils/forge_run_job seem to be executable, strange.\n";
exit(1);
-}
+}
+
+define('INSTALL_METHOD', getenv('INSTALL_METHOD'));
+define('INSTALL_OS', getenv('INSTALL_OS'));
// this should be an existing user of the forge together with its password
// (the password should be different from 'myadmin')
commit cdfc355c899d25e39bc76f66db46073ccab9229f
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 13:06:35 2014 +0200
Factorise some code in the testsuite definition files
diff --git a/tests/Testsuite-common.php b/tests/Testsuite-common.php
new file mode 100644
index 0000000..42f6000
--- /dev/null
+++ b/tests/Testsuite-common.php
@@ -0,0 +1,19 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+ define('PHPUnit_MAIN_METHOD', 'AllTests::main');
+}
+
+if (!@include_once 'PHPUnit/Autoload.php') {
+ include_once 'PHPUnit/Framework.php';
+ require_once 'PHPUnit/TextUI/TestRunner.php';
+}
+
+require_once 'func/Testing/SeleniumRemoteSuite.php';
+
+class TestsuiteCommon
+{
+ public static function main()
+ {
+ PHPUnit_TextUI_TestRunner::run(self::suite());
+ }
+}
diff --git a/tests/Testsuite-deb.php b/tests/Testsuite-deb.php
index 2373fcb..4cfc56d 100644
--- a/tests/Testsuite-deb.php
+++ b/tests/Testsuite-deb.php
@@ -1,25 +1,9 @@
<?php
-/* Main entry point for the Debian packages functionnal test suite */
+require_once 'TestsuiteCommon.php';
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-if (!@include_once 'PHPUnit/Autoload.php') {
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-
-require_once 'func/Testing/SeleniumRemoteSuite.php';
-
-class TestsuiteDeb
+class TestsuiteDeb extends TestsuiteCommon
{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
public static function suite()
{
$suite = new SeleniumRemoteSuite('PHPUnit');
diff --git a/tests/Testsuite-rpm.php b/tests/Testsuite-rpm.php
index 37cfdd6..10a4e56 100644
--- a/tests/Testsuite-rpm.php
+++ b/tests/Testsuite-rpm.php
@@ -1,21 +1,9 @@
<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-if (!@include_once 'PHPUnit/Autoload.php') {
- require_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-require_once 'func/Testing/SeleniumRemoteSuite.php';
+require_once 'TestsuiteCommon.php';
-class TestsuiteRPM
+class TestsuiteRPM extends TestsuiteCommon
{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
public static function suite()
{
$suite = new SeleniumRemoteSuite('PHPUnit');
diff --git a/tests/Testsuite-src-cos.php b/tests/Testsuite-src-cos.php
index 4a6adfd..d59544e 100644
--- a/tests/Testsuite-src-cos.php
+++ b/tests/Testsuite-src-cos.php
@@ -1,21 +1,9 @@
<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-if (!@include_once 'PHPUnit/Autoload.php') {
- require_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-require_once 'func/Testing/SeleniumRemoteSuite.php';
+require_once 'TestsuiteCommon.php';
-class TestsuiteSrcCOS
+class TestsuiteSrcCOS extends TestsuiteCommon
{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
public static function suite()
{
$suite = new SeleniumRemoteSuite('PHPUnit');
diff --git a/tests/Testsuite-src-deb.php b/tests/Testsuite-src-deb.php
index aec9b78..80b4bd0 100644
--- a/tests/Testsuite-src-deb.php
+++ b/tests/Testsuite-src-deb.php
@@ -1,22 +1,9 @@
<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
- define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-if (!@include_once 'PHPUnit/Autoload.php') {
- include_once 'PHPUnit/Framework.php';
- require_once 'PHPUnit/TextUI/TestRunner.php';
-}
-require_once 'func/Testing/SeleniumRemoteSuite.php';
+require_once 'TestsuiteCommon.php';
-class TestsuiteSrcDeb
+class TestsuiteSrcDeb extends TestsuiteCommon
{
- public static function main()
- {
- PHPUnit_TextUI_TestRunner::run(self::suite());
- }
-
public static function suite()
{
$suite = new SeleniumRemoteSuite('PHPUnit');
commit 7aba7f0e8a4cc2a3df012253ca59a641c08e57aa
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 12:57:22 2014 +0200
Renamed classes for readability
diff --git a/tests/Testsuite-deb.php b/tests/Testsuite-deb.php
index 108f190..2373fcb 100644
--- a/tests/Testsuite-deb.php
+++ b/tests/Testsuite-deb.php
@@ -13,7 +13,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'func/Testing/SeleniumRemoteSuite.php';
-class DEBDebian70Tests
+class TestsuiteDeb
{
public static function main()
{
diff --git a/tests/Testsuite-rpm.php b/tests/Testsuite-rpm.php
index 76f675a..37cfdd6 100644
--- a/tests/Testsuite-rpm.php
+++ b/tests/Testsuite-rpm.php
@@ -9,7 +9,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
}
require_once 'func/Testing/SeleniumRemoteSuite.php';
-class RPMCentosTests
+class TestsuiteRPM
{
public static function main()
{
diff --git a/tests/Testsuite-src-cos.php b/tests/Testsuite-src-cos.php
index f5979dd..4a6adfd 100644
--- a/tests/Testsuite-src-cos.php
+++ b/tests/Testsuite-src-cos.php
@@ -9,7 +9,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
}
require_once 'func/Testing/SeleniumRemoteSuite.php';
-class TarCentosTests
+class TestsuiteSrcCOS
{
public static function main()
{
diff --git a/tests/Testsuite-src-deb.php b/tests/Testsuite-src-deb.php
index 513e8da..aec9b78 100644
--- a/tests/Testsuite-src-deb.php
+++ b/tests/Testsuite-src-deb.php
@@ -10,7 +10,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'func/Testing/SeleniumRemoteSuite.php';
-class DEBDebian60Tests
+class TestsuiteSrcDeb
{
public static function main()
{
commit abb9a63ab96e1438ff0f3e9b2cdf0c8549ea507b
Author: Roland Mas <lolando at debian.org>
Date: Wed May 7 12:55:45 2014 +0200
Removed duplicated classes
diff --git a/tests/Testsuite-deb.php b/tests/Testsuite-deb.php
index f790e55..108f190 100644
--- a/tests/Testsuite-deb.php
+++ b/tests/Testsuite-deb.php
@@ -11,7 +11,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'PHPUnit/TextUI/TestRunner.php';
}
-require_once 'func/Testing/DEBSeleniumRemoteSuite.php';
+require_once 'func/Testing/SeleniumRemoteSuite.php';
class DEBDebian70Tests
{
@@ -22,7 +22,7 @@ class DEBDebian70Tests
public static function suite()
{
- $suite = new DEBSeleniumRemoteSuite('PHPUnit');
+ $suite = new SeleniumRemoteSuite('PHPUnit');
// Selenium tests
if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
diff --git a/tests/Testsuite-rpm.php b/tests/Testsuite-rpm.php
index ef9e26e..76f675a 100644
--- a/tests/Testsuite-rpm.php
+++ b/tests/Testsuite-rpm.php
@@ -7,7 +7,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
}
-require_once 'func/Testing/RPMSeleniumRemoteSuite.php';
+require_once 'func/Testing/SeleniumRemoteSuite.php';
class RPMCentosTests
{
@@ -18,7 +18,7 @@ class RPMCentosTests
public static function suite()
{
- $suite = new RPMSeleniumRemoteSuite('PHPUnit');
+ $suite = new SeleniumRemoteSuite('PHPUnit');
// Selenium tests
$suite->addTestFiles(glob("func/Site/*Test.php"));
diff --git a/tests/Testsuite-src-cos.php b/tests/Testsuite-src-cos.php
index 9777cce..f5979dd 100644
--- a/tests/Testsuite-src-cos.php
+++ b/tests/Testsuite-src-cos.php
@@ -7,7 +7,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'PHPUnit/Framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
}
-require_once 'func/Testing/TarSeleniumRemoteSuite.php';
+require_once 'func/Testing/SeleniumRemoteSuite.php';
class TarCentosTests
{
@@ -18,7 +18,7 @@ class TarCentosTests
public static function suite()
{
- $suite = new TarSeleniumRemoteSuite('PHPUnit');
+ $suite = new SeleniumRemoteSuite('PHPUnit');
// Selenium tests
$suite->addTestFiles(glob("func/Site/*Test.php"));
diff --git a/tests/Testsuite-src-deb.php b/tests/Testsuite-src-deb.php
index 18c1ed2..513e8da 100644
--- a/tests/Testsuite-src-deb.php
+++ b/tests/Testsuite-src-deb.php
@@ -8,7 +8,7 @@ if (!@include_once 'PHPUnit/Autoload.php') {
require_once 'PHPUnit/TextUI/TestRunner.php';
}
-require_once 'func/Testing/DEBSeleniumRemoteSuite.php';
+require_once 'func/Testing/SeleniumRemoteSuite.php';
class DEBDebian60Tests
{
@@ -19,7 +19,7 @@ class DEBDebian60Tests
public static function suite()
{
- $suite = new DEBSeleniumRemoteSuite('PHPUnit');
+ $suite = new SeleniumRemoteSuite('PHPUnit');
// Selenium tests
if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
diff --git a/tests/func/Testing/DEBSeleniumRemoteSuite.php b/tests/func/Testing/DEBSeleniumRemoteSuite.php
deleted file mode 100644
index 2b6b233..0000000
--- a/tests/func/Testing/DEBSeleniumRemoteSuite.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require dirname(__FILE__).'/SeleniumRemoteSuite.php';
-
-class DEBSeleniumRemoteSuite extends SeleniumRemoteSuite
-{
- protected function setUp()
- {
- parent::setUp();
- }
-}
diff --git a/tests/func/Testing/RPMSeleniumRemoteSuite.php b/tests/func/Testing/RPMSeleniumRemoteSuite.php
deleted file mode 100644
index 2e492ec..0000000
--- a/tests/func/Testing/RPMSeleniumRemoteSuite.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require dirname(__FILE__).'/SeleniumRemoteSuite.php';
-
-class RPMSeleniumRemoteSuite extends SeleniumRemoteSuite
-{
- protected function setUp()
- {
- parent::setUp();
- }
-}
diff --git a/tests/func/Testing/TarSeleniumRemoteSuite.php b/tests/func/Testing/TarSeleniumRemoteSuite.php
deleted file mode 100644
index a9e4d99..0000000
--- a/tests/func/Testing/TarSeleniumRemoteSuite.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require dirname(__FILE__).'/SeleniumRemoteSuite.php';
-
-class TarSeleniumRemoteSuite extends SeleniumRemoteSuite
-{
- protected function setUp()
- {
- parent::setUp();
- }
-}
-----------------------------------------------------------------------
Summary of changes:
tests/Testsuite-deb.php | 54 --------------------
tests/Testsuite-rpm.php | 49 ------------------
tests/Testsuite-src-cos.php | 49 ------------------
tests/Testsuite-src-deb.php | 51 ------------------
tests/{AllTests.php => Testsuite.php} | 14 ++---
tests/func/PluginsMediawiki/mediawikiTest.php | 3 ++
tests/func/PluginsMoinMoin/moinmoinTest.php | 3 ++
.../func/PluginsOnlineHelp/contextualHelpTest.php | 2 +
tests/func/PluginsScmBzr/bzrTest.php | 3 ++
tests/func/PluginsScmGit/gitSSHTest.php | 3 ++
tests/func/PluginsScmGit/gitWUITest.php | 2 +
tests/func/PluginsScmSvn/svnSSHTest.php | 3 ++
tests/func/SSH/sshTest.php | 3 ++
tests/func/Testing/DEBSeleniumRemoteSuite.php | 11 ----
tests/func/Testing/RPMSeleniumRemoteSuite.php | 11 ----
tests/func/Testing/SeleniumGforge.php | 30 +++++++++++
tests/func/Testing/TarSeleniumRemoteSuite.php | 11 ----
tests/func/vncxstartsuite.sh | 18 +++----
tests/scripts/fusionforge-build-and-test-deb.sh | 2 +-
tests/scripts/fusionforge-build-and-test-rpm.sh | 5 +-
.../scripts/fusionforge-build-and-test-src-cos.sh | 5 +-
.../scripts/fusionforge-build-and-test-src-deb.sh | 4 +-
tests/scripts/phpunit.sh | 28 ++++------
vm/scripts/run-testsuite.sh | 2 +-
24 files changed, 88 insertions(+), 278 deletions(-)
delete mode 100644 tests/Testsuite-deb.php
delete mode 100644 tests/Testsuite-rpm.php
delete mode 100644 tests/Testsuite-src-cos.php
delete mode 100644 tests/Testsuite-src-deb.php
copy tests/{AllTests.php => Testsuite.php} (64%)
mode change 100755 => 100644
mode change 100755 => 100644 tests/func/AllTests.php
mode change 100755 => 100644 tests/func/Forums/forumsTest.php
mode change 100755 => 100644 tests/func/News/newsTest.php
mode change 100755 => 100644 tests/func/Site/loginTest.php
mode change 100755 => 100644 tests/func/Site/projectsTest.php
mode change 100755 => 100644 tests/func/Site/topTest.php
delete mode 100644 tests/func/Testing/DEBSeleniumRemoteSuite.php
delete mode 100644 tests/func/Testing/RPMSeleniumRemoteSuite.php
delete mode 100644 tests/func/Testing/TarSeleniumRemoteSuite.php
mode change 100755 => 100644 tests/func/Trackers/trackersTest.php
mode change 100755 => 100644 tests/func/config.php.buildbot
mode change 100755 => 100644 tests/func/config.php.sample
mode change 100755 => 100644 tests/func/config.php.tests
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list