Merge "Speed up password-handling in the unit tests"

diff --combined tests/phpunit/MediaWikiTestCase.php
index 9f3aa11,ce09eda..c242923
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -221,6 -221,9 +221,9 @@@ abstract class MediaWikiTestCase extend
                $defaultOverrides->set( 'ObjectCaches', $objectCaches );
                $defaultOverrides->set( 'MainCacheType', CACHE_NONE );
  
+               // Use a fast hash algorithm to hash passwords.
+               $defaultOverrides->set( 'PasswordDefault', 'A' );
+ 
                $testConfig = $customOverrides
                        ? new MultiConfig( [ $customOverrides, $defaultOverrides, $baseConfig ] )
                        : new MultiConfig( [ $defaultOverrides, $baseConfig ] );
@@@ -498,7 -501,6 +501,7 @@@
                }
                $wgRequest = new FauxRequest();
                MediaWiki\Session\SessionManager::resetCache();
 +              MediaWiki\Auth\AuthManager::resetCache();
  
                $phpErrorLevel = intval( ini_get( 'error_reporting' ) );
  

diff --combined tests/phpunit/includes/api/ApiLoginTest.php
index e9afd45,510d8bf..2f8ffcc
--- 1/tests/phpunit/includes/api/ApiLoginTest.php
--- 2/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@@ -13,8 -13,6 +13,8 @@@ class ApiLoginTest extends ApiTestCase 
         * Test result of attempted login with an empty username
         */
        public function testApiLoginNoName() {
 +              global $wgDisableAuthManager;
 +
                $session = [
                        'wsTokenSecrets' => [ 'login' => 'foobar' ],
                ];
@@@ -22,11 -20,11 +22,11 @@@
                        'lgname' => '', 'lgpassword' => self::$users['sysop']->password,
                        'lgtoken' => (string)( new MediaWiki\Session\Token( 'foobar', '' ) )
                ], $session );
 -              $this->assertEquals( 'NoName', $data[0]['login']['result'] );
 +              $this->assertEquals( $wgDisableAuthManager ? 'NoName' : 'Failed', $data[0]['login']['result'] );
        }
  
        public function testApiLoginBadPass() {
 -              global $wgServer;
 +              global $wgServer, $wgDisableAuthManager;
  
                $user = self::$users['sysop'];
                $user->getUser()->logout();
@@@ -63,7 -61,7 +63,7 @@@
                $this->assertNotInternalType( "bool", $result );
                $a = $result["login"]["result"];
  
 -              $this->assertEquals( "WrongPass", $a );
 +              $this->assertEquals( $wgDisableAuthManager ? 'WrongPass' : 'Failed', $a );
        }
  
        public function testApiLoginGoodPass() {
@@@ -228,8 -226,7 +228,7 @@@
                $passwordFactory = new PasswordFactory();
                $passwordFactory->init( RequestContext::getMain()->getConfig() );
                // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only
-               $passwordFactory->setDefaultType( 'A' );
-               $pwhash = $passwordFactory->newFromPlaintext( 'foobaz' );
+               $passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' );
  
                $dbw = wfGetDB( DB_MASTER );
                $dbw->insert(
@@@ -237,7 -234,7 +236,7 @@@
                        [
                                'bp_user' => $centralId,
                                'bp_app_id' => 'foo',
-                               'bp_password' => $pwhash->toString(),
+                               'bp_password' => $passwordHash->toString(),
                                'bp_token' => '',
                                'bp_restrictions' => MWRestrictions::newDefault()->toJson(),
                                'bp_grants' => '["test"]',