[Fusionforge-commits] r14810 - in trunk/tests: . scripts

[Alain Peyrat]

Author: aljeux
Date: 2011-11-16 15:40:12 +0100 (Wed, 16 Nov 2011)
New Revision: 14810

Added:
   trunk/tests/RPMCentosTests.php
Removed:
   trunk/tests/RPMCentos52Tests.php
Modified:
   trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
   trunk/tests/scripts/phpunit.sh
Log:
Rename test suite RPMCentos52Tests.php to RPMCentosTests.php

Deleted: trunk/tests/RPMCentos52Tests.php
===================================================================
--- trunk/tests/RPMCentos52Tests.php	2011-11-16 14:40:10 UTC (rev 14809)
+++ trunk/tests/RPMCentos52Tests.php	2011-11-16 14:40:12 UTC (rev 14810)
@@ -1,42 +0,0 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
-	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'func/Testing/RPMSeleniumRemoteSuite.php';
-
-class RPMCentos52Tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new RPMSeleniumRemoteSuite('PHPUnit');
-
-		// Selenium tests
-		$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/PluginsOnlineHelp/*Test.php"));
-//		$suite->addTestFiles(glob("func/PluginsSvnTracker/*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();
-}
-?>

Copied: trunk/tests/RPMCentosTests.php (from rev 14801, trunk/tests/RPMCentos52Tests.php)
===================================================================
--- trunk/tests/RPMCentosTests.php	                        (rev 0)
+++ trunk/tests/RPMCentosTests.php	2011-11-16 14:40:12 UTC (rev 14810)
@@ -0,0 +1,42 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+	define('PHPUnit_MAIN_METHOD', 'AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'func/Testing/RPMSeleniumRemoteSuite.php';
+
+class RPMCentosTests
+{
+	public static function main()
+	{
+		PHPUnit_TextUI_TestRunner::run(self::suite());
+	}
+
+	public static function suite()
+	{
+		$suite = new RPMSeleniumRemoteSuite('PHPUnit');
+
+		// Selenium tests
+		$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/PluginsOnlineHelp/*Test.php"));
+//		$suite->addTestFiles(glob("func/PluginsSvnTracker/*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();
+}
+?>

Modified: trunk/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-16 14:40:10 UTC (rev 14809)
+++ trunk/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-16 14:40:12 UTC (rev 14810)
@@ -39,7 +39,7 @@
 echo "Run phpunit test on $HOST in $FORGE_HOME"
 if xterm -e "sh -c exit" 2>/dev/null
 then
-        ssh -X root@$HOST "$FORGE_HOME/tests/scripts/phpunit.sh RPMCentos52Tests.php" || retcode=$?
+        ssh -X root@$HOST "$FORGE_HOME/tests/scripts/phpunit.sh RPMCentosTests.php" || retcode=$?
         rsync -av root@$HOST:/var/log/ $WORKSPACE/reports/
 else
         echo "No display is available, NOT RUNNING TESTS"

Modified: trunk/tests/scripts/phpunit.sh
===================================================================
--- trunk/tests/scripts/phpunit.sh	2011-11-16 14:40:10 UTC (rev 14809)
+++ trunk/tests/scripts/phpunit.sh	2011-11-16 14:40:12 UTC (rev 14810)
@@ -7,7 +7,7 @@
 else
         echo "You must give the testsuite to run :"
 	echo "	- DEBDebian60Tests.php"
-	echo "	- RPMCentos52Tests.php"
+	echo "	- RPMCentosTests.php"
 	echo "	- TarCentos52Tests.php"
 fi
 if [ "x$testsuite" = "x" ]