[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-48-g74c8d5e

[Sylvain Beucler]

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.0 has been updated
       via  74c8d5eafb58369ece86350d2f49f6b74cc41614 (commit)
      from  d651a61858cd89a9e82b68c602e2bacd36facff4 (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=74c8d5eafb58369ece86350d2f49f6b74cc41614

commit 74c8d5eafb58369ece86350d2f49f6b74cc41614
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Sep 3 18:39:33 2015 +0200

    testsuite: remove unused SeleniumRemoteSuite class

diff --git a/tests/func/Testing/SeleniumRemoteSuite.php b/tests/func/Testing/SeleniumRemoteSuite.php
deleted file mode 100644
index 1d30c72..0000000
--- a/tests/func/Testing/SeleniumRemoteSuite.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * This file is part of FusionForge.
- *
- * FusionForge is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * FusionForge is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-// The next require_once is just to get HOST
-$config = getenv('CONFIG_PHP') ? getenv('CONFIG_PHP'): 'func/config.php';
-require_once $config;
-
-class SeleniumRemoteSuite extends PHPUnit_Framework_TestSuite
-{
-	protected function setUp()
-	{
-		if (getenv('SELENIUM_RC_DIR') && getenv('SELENIUM_RC_URL')) {
-			$this->captureScreenshotOnFailure = true;
-			$this->screenshotPath = getenv('SELENIUM_RC_DIR');
-			$this->screenshotUrl = getenv('SELENIUM_RC_URL');
-		}
-	}
-}
diff --git a/tests/func/phpunit-selenium.sh b/tests/func/phpunit-selenium.sh
index 48f1538..5b113c1 100755
--- a/tests/func/phpunit-selenium.sh
+++ b/tests/func/phpunit-selenium.sh
@@ -53,7 +53,7 @@ cd $FORGE_HOME
 SELENIUM_RC_DIR=/var/log
 SELENIUM_RC_URL=${HUDSON_URL}job/${JOB_NAME}/ws/reports
 SELENIUM_RC_HOST=$HOST
-# the PHP file provided through CONFIG_PHP will be loaded inside the functionnal test suite with require_once, in SeleniumRemoteSuite.php
+# the PHP file provided through CONFIG_PHP will be loaded inside the functionnal test suite with require_once, in SeleniumForge.php
 CONFIG_PHP=func/config.php
 export SELENIUM_RC_DIR SELENIUM_RC_URL SELENIUM_RC_HOST HOST DB_NAME DB_USER CONFIG_PHP
 
diff --git a/tests/func_tests.php b/tests/func_tests.php
index ec5648e..3b3b2a9 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -8,7 +8,8 @@ if (!@include_once 'PHPUnit/Autoload.php') {
 	require_once 'PHPUnit/TextUI/TestRunner.php';
 }
 
-require_once 'func/Testing/SeleniumRemoteSuite.php';
+$config = getenv('CONFIG_PHP') ? getenv('CONFIG_PHP'): 'func/config.php';
+require_once $config;
 
 class AllTests
 {
@@ -19,7 +20,7 @@ class AllTests
 
 	public static function suite()
 	{
-		$suite = new SeleniumRemoteSuite('PHPUnit');
+		$suite = new PHPUnit_Framework_TestSuite('PHPUnit');
 
 		// Selenium tests
 		if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }

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

Summary of changes:
 tests/func/Testing/SeleniumRemoteSuite.php | 34 ------------------------------
 tests/func/phpunit-selenium.sh             |  2 +-
 tests/func_tests.php                       |  5 +++--
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 tests/func/Testing/SeleniumRemoteSuite.php


hooks/post-receive
-- 
FusionForge