Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exclude Block tests until somebody fixes them, also cache listTables() result so we can skip some queries

Browse source
This commit is contained in:
Chad Horohoe 2011-06-01 22:54:33 +00:00
parent f639fcdc4f
commit 5004f09bfa
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/phpunit/MediaWikiTestCase.php
View file

@ -12,6 +12,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
protected $oldTablePrefix;
protected $useTemporaryTables = true;
private static $dbSetup = false;
private static $dbTables = null;
/**
* Table name prefixes. Oracle likes it shorter.
@ -191,18 +192,21 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
protected function listTables() {
global $wgDBprefix;
$tables = $this->db->listTables( $wgDBprefix, __METHOD__ );
$tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables );
if( is_null( self::$dbTables ) ) {
$tables = $this->db->listTables( $wgDBprefix, __METHOD__ );
$tables = array_map( array( __CLASS__, 'unprefixTable' ), $tables );
if ( $this->db->getType() == 'sqlite' ) {
$tables = array_flip( $tables );
// these are subtables of searchindex and don't need to be duped/dropped separately
unset( $tables['searchindex_content'] );
unset( $tables['searchindex_segdir'] );
unset( $tables['searchindex_segments'] );
$tables = array_flip( $tables );
if ( $this->db->getType() == 'sqlite' ) {
$tables = array_flip( $tables );
// these are subtables of searchindex and don't need to be duped/dropped separately
unset( $tables['searchindex_content'] );
unset( $tables['searchindex_segdir'] );
unset( $tables['searchindex_segments'] );
$tables = array_flip( $tables );
}
self::$dbTables = $tables;
}
return $tables;
return self::$dbTables;
}

1
tests/phpunit/includes/BlockTest.php
View file

@ -2,6 +2,7 @@
/**
* @group Database
* @group Broken
*/
class BlockTest extends MediaWikiLangTestCase {