From 8de3f25f006bd01b9f623f52c150a1ea9ccfc55b Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Mon, 25 Oct 2010 17:45:46 +0000 Subject: [PATCH] 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. --- maintenance/tests/phpunit/includes/search/SearchDbTest.php | 4 ---- .../tests/phpunit/includes/search/SearchUpdateTest.php | 3 --- 2 files changed, 7 deletions(-) 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; -- 2.20.1