Removed overzealous cleanup that was responsible for failures of tests in CruiseContr...

diff --git a/maintenance/tests/phpunit/includes/search/SearchDbTest.php b/maintenance/tests/phpunit/includes/search/SearchDbTest.php
index eecedfd..f35e8b3 100644 (file)
--- 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 fd7230d..1cfb276 100644 (file)
--- 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;