From: Marius Hoch <hoo@online.de>
Date: Sun, 19 Oct 2014 22:22:02 +0000 (+0200)
Subject: Make TestUser way faster
X-Git-Tag: 1.31.0-rc.0~13570^2
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=ee9166a10e9d6c90a31b7ae76bd2755a2004643c;p=lhc%2Fweb%2Fwiklou.git

Make TestUser way faster

By only updating the user row in the database, if needed
and by making use of md5 for passwords instead of slower
hashing.
This cut down run time of some Wikibase API tests to 20%
of the original value for me!
Also it reduces the run time of MediaWiki's test suite
by about 45s on jenkins.

Change-Id: I7024b287a71fe9b327dbcdc5427cd8edb5047606
---

diff --git a/includes/User.php b/includes/User.php
index e6425f879d..2fa684967c 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3817,7 +3817,6 @@ class User implements IDBAccessObject {
 			return false;
 		}
 
-		$passwordFactory = self::getPasswordFactory();
 		if ( !$this->mPassword->equals( $password ) ) {
 			if ( $wgLegacyEncoding ) {
 				// Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
@@ -3831,6 +3830,7 @@ class User implements IDBAccessObject {
 			}
 		}
 
+		$passwordFactory = self::getPasswordFactory();
 		if ( $passwordFactory->needsUpdate( $this->mPassword ) ) {
 			$this->mPassword = $passwordFactory->newFromPlaintext( $password );
 			$this->saveSettings();
diff --git a/includes/password/PasswordFactory.php b/includes/password/PasswordFactory.php
index 48d6866926..86a3fefd58 100644
--- a/includes/password/PasswordFactory.php
+++ b/includes/password/PasswordFactory.php
@@ -68,6 +68,15 @@ final class PasswordFactory {
 		$this->default = $type;
 	}
 
+	/**
+	 * Get the default password type
+	 *
+	 * @return string
+	 */
+	public function getDefaultType() {
+		return $this->default;
+	}
+
 	/**
 	 * Initialize the internal static variables using the global variables
 	 *
diff --git a/tests/phpunit/includes/TestUser.php b/tests/phpunit/includes/TestUser.php
index 7a61cfd1aa..39822dc0a7 100644
--- a/tests/phpunit/includes/TestUser.php
+++ b/tests/phpunit/includes/TestUser.php
@@ -63,9 +63,9 @@ class TestUser {
 		}
 
 		// Update the user to use the password and other details
-		$this->user->setPassword( $this->password );
-		$this->user->setEmail( $email );
-		$this->user->setRealName( $realname );
+		$change = $this->setPassword( $this->password ) ||
+			$this->setEmail( $email ) ||
+			$this->setRealName( $realname );
 
 		// Adjust groups by adding any missing ones and removing any extras
 		$currentGroups = $this->user->getGroups();
@@ -75,7 +75,59 @@ class TestUser {
 		foreach ( array_diff( $currentGroups, $groups ) as $group ) {
 			$this->user->removeGroup( $group );
 		}
-		$this->user->saveSettings();
+		if ( $change ) {
+			$this->user->saveSettings();
+		}
+	}
+
+	/**
+	 * @param string $realname
+	 * @return bool
+	 */
+	private function setRealName( $realname ) {
+		if ( $this->user->getRealName() !== $realname ) {
+			$this->user->setRealName( $realname );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $email
+	 * @return bool
+	 */
+	private function setEmail( $email ) {
+		if ( $this->user->getEmail() !== $email ) {
+			$this->user->setEmail( $email );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $password
+	 * @return bool
+	 */
+	private function setPassword( $password ) {
+		$passwordFactory = $this->user->getPasswordFactory();
+		$oldDefaultType = $passwordFactory->getDefaultType();
+
+		 // B is salted MD5 (thus fast) ... we don't care about security here, this is test only
+		$passwordFactory->setDefaultType( 'B' ); // @TODO: Change this to A once that is fixed: https://gerrit.wikimedia.org/r/167523
+		$newPassword = $passwordFactory->newFromPlaintext( $password , $this->user->getPassword() );
+
+		$change = false;
+		if ( !$this->user->getPassword()->equals( $newPassword ) ) {
+			// Password changed
+			$this->user->setPassword( $password );
+			$change = true;
+		}
+
+		$passwordFactory->setDefaultType( $oldDefaultType );
+
+		return $change;
 	}
 
 	/**