From: Paul Copperman <pcopp@users.mediawiki.org>
Date: Mon, 11 Apr 2011 16:41:23 +0000 (+0000)
Subject: Follow-Up r85618:
X-Git-Tag: 1.31.0-rc.0~30935
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8ec3ce80d96c36d9e37bb24384df72b9b59d9533;p=lhc%2Fweb%2Fwiklou.git

Follow-Up r85618:
* UploadFromUrlTest.php: Remove another instance of stray ini_set statements.
* Makefile: Also exclude group Stub from tests when running 'make noparser' etc.
---

diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile
index 616b034906..24536efc8e 100644
--- a/tests/phpunit/Makefile
+++ b/tests/phpunit/Makefile
@@ -47,16 +47,16 @@ coverage:
 parser:
 	${PU} --group Parser
 noparser:
-	${PU} --exclude-group Parser,Broken
+	${PU} --exclude-group Parser,Broken,Stub
 
 safe:
-	${PU} --exclude-group Broken,Destructive
+	${PU} --exclude-group Broken,Destructive,Stub
 
 databaseless:
-	${PU} --exclude-group Broken,Destructive,Database
+	${PU} --exclude-group Broken,Destructive,Database,Stub
 
 database:
-	${PU} --exclude-group Broken,Destructive --group Database
+	${PU} --exclude-group Broken,Destructive,Stub --group Database
 
 list-groups:
 	${PU} --list-groups
diff --git a/tests/phpunit/includes/UploadFromUrlTest.php b/tests/phpunit/includes/UploadFromUrlTest.php
index 03d52ba50f..c86e9e2a86 100644
--- a/tests/phpunit/includes/UploadFromUrlTest.php
+++ b/tests/phpunit/includes/UploadFromUrlTest.php
@@ -17,10 +17,6 @@ class UploadFromUrlTest extends ApiTestSetup {
 		$wgAllowAsyncCopyUploads = true;
 		wfSetupSession();
 
-		ini_set( 'log_errors', 1 );
-		ini_set( 'error_reporting', 1 );
-		ini_set( 'display_errors', 1 );
-
 		if ( wfLocalFile( 'UploadFromUrlTest.png' )->exists() ) {
 			$this->deleteFile( 'UploadFromUrlTest.png' );
 		}