From: Max Semenik <maxsem@users.mediawiki.org>
Date: Mon, 25 Oct 2010 17:45:46 +0000 (+0000)
Subject: Removed overzealous cleanup that was responsible for failures of tests in CruiseContr... 
X-Git-Tag: 1.31.0-rc.0~34318
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=8de3f25f006bd01b9f623f52c150a1ea9ccfc55b;p=lhc%2Fweb%2Fwiklou.git

Removed overzealous cleanup that was responsible for failures of tests in CruiseControl. Will investigate this further later, now fixing just enough to make things work.
---

diff --git a/maintenance/tests/phpunit/includes/search/SearchDbTest.php b/maintenance/tests/phpunit/includes/search/SearchDbTest.php
index eecedfd06d..f35e8b325f 100644
--- a/maintenance/tests/phpunit/includes/search/SearchDbTest.php
+++ b/maintenance/tests/phpunit/includes/search/SearchDbTest.php
@@ -26,10 +26,6 @@ class SearchDbTest extends SearchEngineTest {
 
 	function tearDown() {
 		$this->removeSearchData();
-		if ( !is_null( $this->db ) ) {
-			wfGetLB()->closeConnecton( $this->db );
-		}
-		unset( $this->db );
 		unset( $this->search );
 		$GLOBALS['wgContLang'] = null;
 	}
diff --git a/maintenance/tests/phpunit/includes/search/SearchUpdateTest.php b/maintenance/tests/phpunit/includes/search/SearchUpdateTest.php
index fd7230d327..1cfb276d9c 100644
--- a/maintenance/tests/phpunit/includes/search/SearchUpdateTest.php
+++ b/maintenance/tests/phpunit/includes/search/SearchUpdateTest.php
@@ -74,14 +74,11 @@ class SearchUpdateTest extends PHPUnit_Framework_TestCase {
 		$wgLBFactoryConf['class'] = 'LBFactory_Simple';
 		$wgDBservers = null;
 		$wgContLang = Language::factory( 'en' );
-		LBFactory::destroyInstance();
 	}
 
 	function tearDown() {
 		global $wgSearchType, $wgDBtype, $wgLBFactoryConf, $wgDBservers, $wgContLang;
 
-		LBFactory::destroyInstance();
-
 		$wgSearchType = self::$searchType;
 		$wgDBtype = self::$dbtype;
 		$wgLBFactoryConf = self::$factoryconf;