X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=tests%2Fphpunit%2Fphpunit.php;h=77690cdd292947ffcb394a8787c8480b23792e4c;hb=1162ed5f88e5a77ea6feed971813914a95004b4f;hp=d876c4578a00633a036515fedcfdd1326a6b405c;hpb=6593f76927558202414e67d4ee1435c96baea658;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index d876c4578a..77690cdd29 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -139,10 +139,6 @@ class PHPUnitMaintClass extends Maintenance {
 		// may break testing against floating point values
 		// treated with PHP's serialize()
 		ini_set( 'serialize_precision', 17 );
-
-		// TODO: we should call MediaWikiTestCase::prepareServices( new GlobalVarConfig() ) here.
-		// But PHPUnit may not be loaded yet, so we have to wait until just
-		// before PHPUnit_TextUI_Command::main() is executed at the end of this file.
 	}
 
 	public function execute() {
@@ -241,9 +237,4 @@ echo defined( 'HHVM_VERSION' ) ?
 	'Using HHVM ' . HHVM_VERSION . ' (' . PHP_VERSION . ")\n" :
 	'Using PHP ' . PHP_VERSION . "\n";
 
-// Prepare global services for unit tests.
-// FIXME: this should be done in the finalSetup() method,
-// but PHPUnit may not have been loaded at that point.
-MediaWikiTestCase::prepareServices( new GlobalVarConfig() );
-
 $wgPhpUnitClass::main();