From: Stephane Bisson <sbisson@wikimedia.org>
Date: Thu, 7 Mar 2019 21:18:22 +0000 (-0500)
Subject: UserTest: correctly reset fake time
X-Git-Tag: 1.34.0-rc.0~2612^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=46e5b28e3f1f750a7b9172679b88fcc51700247c;p=lhc%2Fweb%2Fwiklou.git

UserTest: correctly reset fake time

Change-Id: I5fc64506781fbc40e81719aa03441643c38d4e54
Follows-Up: Ica3e6e7165496bdc9b8f12972cf93847ecfffa50
Bug: T216631
---

diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index dad7bf29e1..164b46644d 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -1472,14 +1472,18 @@ class UserTest extends MediaWikiTestCase {
 		MWTimestamp::setFakeTime( function () use ( &$clock ) {
 			return $clock += 1000;
 		} );
-		$user = $this->getTestUser()->getUser();
-		$firstRevision = self::makeEdit( $user, 'Help:UserTest_GetEditTimestamp', 'one', 'test' );
-		$secondRevision = self::makeEdit( $user, 'Help:UserTest_GetEditTimestamp', 'two', 'test' );
-		// Sanity check: revisions timestamp are different
-		$this->assertNotEquals( $firstRevision->getTimestamp(), $secondRevision->getTimestamp() );
-
-		$this->assertEquals( $firstRevision->getTimestamp(), $user->getFirstEditTimestamp() );
-		$this->assertEquals( $secondRevision->getTimestamp(), $user->getLatestEditTimestamp() );
+		try {
+			$user = $this->getTestUser()->getUser();
+			$firstRevision = self::makeEdit( $user, 'Help:UserTest_GetEditTimestamp', 'one', 'test' );
+			$secondRevision = self::makeEdit( $user, 'Help:UserTest_GetEditTimestamp', 'two', 'test' );
+			// Sanity check: revisions timestamp are different
+			$this->assertNotEquals( $firstRevision->getTimestamp(), $secondRevision->getTimestamp() );
+
+			$this->assertEquals( $firstRevision->getTimestamp(), $user->getFirstEditTimestamp() );
+			$this->assertEquals( $secondRevision->getTimestamp(), $user->getLatestEditTimestamp() );
+		} finally {
+			MWTimestamp::setFakeTime( false );
+		}
 	}
 
 	/**