From 80b39eced0551cd30a2dfae2aa8c0c2a49b531ed Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 29 Jun 2010 03:44:08 +0000
Subject: [PATCH] Removed the hacks from r62948 to skip ApiTest if the parser
 test database is currently active. This is no longer necessary since the
 parser tests tear down the database environment properly.

---
 maintenance/tests/ApiTest.php | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/maintenance/tests/ApiTest.php b/maintenance/tests/ApiTest.php
index fa48f5ee06..ef6f141b4c 100644
--- a/maintenance/tests/ApiTest.php
+++ b/maintenance/tests/ApiTest.php
@@ -55,10 +55,8 @@ class ApiTest extends ApiTestSetup {
 	}
 
 	function testApi() {
-		global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( !isset( $wgServerName ) || !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
@@ -73,10 +71,8 @@ class ApiTest extends ApiTestSetup {
 	}
 
 	function testApiLoginNoName() {
-		global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( !isset( $wgServerName ) || !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
@@ -94,10 +90,8 @@ class ApiTest extends ApiTestSetup {
 	}
 
 	function testApiLoginBadPass() {
-		global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( !isset( $wgServerName ) || !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
@@ -131,10 +125,8 @@ class ApiTest extends ApiTestSetup {
 	}
 
 	function testApiLoginGoodPass() {
-		global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( !isset( $wgServerName ) || !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
@@ -171,10 +163,8 @@ class ApiTest extends ApiTestSetup {
 	}
 
 	function testApiGotCookie() {
-		global $wgServerName, $wgServer, $wgScriptPath, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer, $wgScriptPath;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( !isset( $wgServerName ) || !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
@@ -214,10 +204,8 @@ class ApiTest extends ApiTestSetup {
 	 */
 	function testApiListPages( CookieJar $cj ) {
 		$this->markTestIncomplete( "Not done with this yet" );
-		global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype;
+		global $wgServerName, $wgServer;
 
-		if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) )
-			$this->markTestSkipped( "This test can't (yet?) be run with the parser tests" );
 		if ( $wgServerName == "localhost" || $wgServer == "http://localhost" ) {
 			$this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' .
 									  'be set in LocalSettings.php' );
-- 
2.20.1