| Index: trunk/phase3/tests/phpunit/MediaWikiTestCase.php |
| — | — | @@ -12,6 +12,7 @@ |
| 13 | 13 | protected $oldTablePrefix; |
| 14 | 14 | protected $useTemporaryTables = true; |
| 15 | 15 | private static $dbSetup = false; |
| | 16 | + private static $dbTables = null; |
| 16 | 17 | |
| 17 | 18 | /** |
| 18 | 19 | * Table name prefixes. Oracle likes it shorter. |
| — | — | @@ -191,18 +192,21 @@ |
| 192 | 193 | protected function listTables() { |
| 193 | 194 | global $wgDBprefix; |
| 194 | 195 | |
| 195 | | - $tables = $this->db->listTables( $wgDBprefix, __METHOD__ ); |
| 196 | | - $tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables ); |
| | 196 | + if( is_null( self::$dbTables ) ) { |
| | 197 | + $tables = $this->db->listTables( $wgDBprefix, __METHOD__ ); |
| | 198 | + $tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables ); |
| 197 | 199 | |
| 198 | | - if ( $this->db->getType() == 'sqlite' ) { |
| 199 | | - $tables = array_flip( $tables ); |
| 200 | | - // these are subtables of searchindex and don't need to be duped/dropped separately |
| 201 | | - unset( $tables['searchindex_content'] ); |
| 202 | | - unset( $tables['searchindex_segdir'] ); |
| 203 | | - unset( $tables['searchindex_segments'] ); |
| 204 | | - $tables = array_flip( $tables ); |
| | 200 | + if ( $this->db->getType() == 'sqlite' ) { |
| | 201 | + $tables = array_flip( $tables ); |
| | 202 | + // these are subtables of searchindex and don't need to be duped/dropped separately |
| | 203 | + unset( $tables['searchindex_content'] ); |
| | 204 | + unset( $tables['searchindex_segdir'] ); |
| | 205 | + unset( $tables['searchindex_segments'] ); |
| | 206 | + $tables = array_flip( $tables ); |
| | 207 | + } |
| | 208 | + self::$dbTables = $tables; |
| 205 | 209 | } |
| 206 | | - return $tables; |
| | 210 | + return self::$dbTables; |
| 207 | 211 | |
| 208 | 212 | } |
| 209 | 213 | |
| Index: trunk/phase3/tests/phpunit/includes/BlockTest.php |
| — | — | @@ -2,6 +2,7 @@ |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * @group Database |
| | 6 | + * @group Broken |
| 6 | 7 | */ |
| 7 | 8 | class BlockTest extends MediaWikiLangTestCase { |
| 8 | 9 | |