| Index: trunk/phase3/maintenance/tests/phpunit/includes/search/SearchDbTest.php |
| — | — | @@ -26,10 +26,6 @@ |
| 27 | 27 | |
| 28 | 28 | function tearDown() { |
| 29 | 29 | $this->removeSearchData(); |
| 30 | | - if ( !is_null( $this->db ) ) { |
| 31 | | - wfGetLB()->closeConnecton( $this->db ); |
| 32 | | - } |
| 33 | | - unset( $this->db ); |
| 34 | 30 | unset( $this->search ); |
| 35 | 31 | $GLOBALS['wgContLang'] = null; |
| 36 | 32 | } |
| Index: trunk/phase3/maintenance/tests/phpunit/includes/search/SearchUpdateTest.php |
| — | — | @@ -74,14 +74,11 @@ |
| 75 | 75 | $wgLBFactoryConf['class'] = 'LBFactory_Simple'; |
| 76 | 76 | $wgDBservers = null; |
| 77 | 77 | $wgContLang = Language::factory( 'en' ); |
| 78 | | - LBFactory::destroyInstance(); |
| 79 | 78 | } |
| 80 | 79 | |
| 81 | 80 | function tearDown() { |
| 82 | 81 | global $wgSearchType, $wgDBtype, $wgLBFactoryConf, $wgDBservers, $wgContLang; |
| 83 | 82 | |
| 84 | | - LBFactory::destroyInstance(); |
| 85 | | - |
| 86 | 83 | $wgSearchType = self::$searchType; |
| 87 | 84 | $wgDBtype = self::$dbtype; |
| 88 | 85 | $wgLBFactoryConf = self::$factoryconf; |