From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 May 2017 02:32:24 +0000 (-0700)
Subject: Make LocalPasswordPrimaryAuthenticationProviderTest use TS_MW timestamp conversion
X-Git-Tag: 1.31.0-rc.0~3281^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=3441ed1900d37c4c0f7c256f7b7ec78980a24403;p=lhc%2Fweb%2Fwiklou.git

Make LocalPasswordPrimaryAuthenticationProviderTest use TS_MW timestamp conversion

Bug: T75174
Change-Id: I217a8e1847a21d54434693fafa7f618ec5840876
---

diff --git a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index b89f1e02e4..4d603422f2 100644
--- a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@ -509,7 +509,10 @@ class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase
 
 		$this->assertSame(
 			$expectExpiry,
-			$dbw->selectField( 'user', 'user_password_expires', [ 'user_name' => $cuser ] )
+			wfTimestampOrNull(
+				TS_MW,
+				$dbw->selectField( 'user', 'user_password_expires', [ 'user_name' => $cuser ] )
+			)
 		);
 	}