Merge "UserTest: correctly reset fake time"

diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index dad7bf2..164b466 100644 (file)
--- 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 );
+               }
        }
 
        /**