Merge "Selenium: replace UserLoginPage with BlankPage where possible"

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiPHPUnitCommand.php

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index 5d139ff..6b1d817 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -2,7 +2,6 @@
 
 class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
        private $cliArgs;
-       private $logListener;
 
        public function __construct( $ignorableOptions, $cliArgs ) {
                $ignore = function ( $arg ) {
@@ -21,22 +20,19 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
 
                // Add our own listeners
                $this->arguments['listeners'][] = new MediaWikiPHPUnitTestListener;
-               $this->logListener = new MediaWikiLoggerPHPUnitTestListener;
-               $this->arguments['listeners'][] = $this->logListener;
+               $this->arguments['listeners'][] = new MediaWikiLoggerPHPUnitTestListener;
 
                // Output only to stderr to avoid "Headers already sent" problems
                $this->arguments['stderr'] = true;
 
-               // We could create a printer instance and avoid passing the
-               // listener statically, but then we have to recreate the
-               // appropriate arguments handling + defaults.
+               // Use a custom result printer that includes per-test logging output
+               // when nothing is provided.
                if ( !isset( $this->arguments['printer'] ) ) {
                        $this->arguments['printer'] = MediaWikiPHPUnitResultPrinter::class;
                }
        }
 
        protected function createRunner() {
-               MediaWikiPHPUnitResultPrinter::setLogListener( $this->logListener );
                $runner = new MediaWikiTestRunner;
                $runner->setMwCliArgs( $this->cliArgs );
                return $runner;