| Index: trunk/phase3/tests/phpunit/MediaWikiTestCase.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | * Replace with a HashBag. They would not be going to persist anyway. |
| 37 | 37 | */ |
| 38 | 38 | ObjectCache::$instances[CACHE_DB] = new HashBagOStuff; |
| 39 | | - |
| | 39 | + |
| 40 | 40 | if( $this->needsDB() ) { |
| 41 | 41 | |
| 42 | 42 | global $wgDBprefix; |
| Index: trunk/phase3/tests/phpunit/phpunit.php |
| — | — | @@ -22,11 +22,18 @@ |
| 23 | 23 | parent::finalSetup(); |
| 24 | 24 | |
| 25 | 25 | global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType, $wgUseDatabaseMessages; |
| | 26 | + global $wgLocaltimezone, $wgLocalisationCacheConf; |
| 26 | 27 | |
| 27 | 28 | $wgMainCacheType = CACHE_NONE; |
| 28 | 29 | $wgMessageCacheType = CACHE_NONE; |
| 29 | 30 | $wgParserCacheType = CACHE_NONE; |
| | 31 | + |
| 30 | 32 | $wgUseDatabaseMessages = false; # Set for future resets |
| | 33 | + |
| | 34 | + // Assume UTC for testing purposes |
| | 35 | + $wgLocaltimezone = 'UTC'; |
| | 36 | + |
| | 37 | + $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null'; |
| 31 | 38 | } |
| 32 | 39 | public function execute() { } |
| 33 | 40 | public function getDbType() { |
| — | — | @@ -37,11 +44,6 @@ |
| 38 | 45 | $maintClass = 'PHPUnitMaintClass'; |
| 39 | 46 | require( RUN_MAINTENANCE_IF_MAIN ); |
| 40 | 47 | |
| 41 | | -// Assume UTC for testing purposes |
| 42 | | -$wgLocaltimezone = 'UTC'; |
| 43 | | - |
| 44 | | -$wgLocalisationCacheConf['storeClass'] = 'LCStore_Null'; |
| 45 | | - |
| 46 | 48 | if( !in_array( '--configuration', $_SERVER['argv'] ) ) { |
| 47 | 49 | //Hack to eliminate the need to use the Makefile (which sucks ATM) |
| 48 | 50 | $_SERVER['argv'][] = '--configuration'; |