resourceloader: Avoid mw-exception log spam from PHPUnit tests

Bug: T50002
Change-Id: Ida18f271883535eca2a1d26ee34120190914d87a

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
index 1e09e92..03a609b 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
@@ -400,6 +400,10 @@ mw.loader.register( [
                $module = new ResourceLoaderStartUpModule();
                $out = ltrim( $case['out'], "\n" );
 
+               // Disable log from getModuleRegistrations via MWExceptionHandler
+               // for case where getVersionHash() is expected to throw.
+               $this->setLogger( 'exception', new Psr\Log\NullLogger() );
+
                $this->assertEquals(
                        self::expandPlaceholders( $out ),
                        $module->getModuleRegistrations( $context ),

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index 1422adc..e6f709d 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -588,7 +588,9 @@ mw.example();
         * @covers ResourceLoader::getCombinedVersion
         */
        public function testGetCombinedVersion() {
-               $rl = new EmptyResourceLoader();
+               $rl = $this->getMockBuilder( EmptyResourceLoader::class )
+                       // Disable log from outputErrorAndLog
+                       ->setMethods( [ 'outputErrorAndLog' ] )->getMock();
                $rl->register( [
                        'foo' => self::getSimpleModuleMock(),
                        'ferry' => self::getFailFerryMock(),
@@ -720,6 +722,9 @@ mw.example();
                        $rl
                );
 
+               // Disable log from makeModuleResponse via outputErrorAndLog
+               $this->setLogger( 'exception', new Psr\Log\NullLogger() );
+
                $response = $rl->makeModuleResponse( $context, $modules );
                $errors = $rl->getErrors();
 
@@ -764,6 +769,9 @@ mw.example();
                        'getModuleNames'
                );
 
+               // Disable log from makeModuleResponse via outputErrorAndLog
+               $this->setLogger( 'exception', new Psr\Log\NullLogger() );
+
                $modules = [ 'startup' => $rl->getModule( 'startup' ) ];
                $response = $rl->makeModuleResponse( $context, $modules );
                $errors = $rl->getErrors();