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 616b034..24536ef 100644 (file)
--- 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 03d52ba..c86e9e2 100644 (file)
--- 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' );
                }