Changeset 52587

Timestamp:

01/17/2022 01:47:45 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Fix race conditions in current_time() tests.

• Restore default timezone before performing assertions to avoid affecting other tests in case of failure.
• Use delta comparison for timestamps to avoid race conditions.

Props SergeyBiryukov, desrosj.
Merges [45857] to the 5.1 branch.
Fixes #45821.

Location:

branches/5.1

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/date/currentTime.php (modified) (1 diff)

branches/5.1/tests/phpunit/tests/date/currentTime.php

@@ -15 +15 @@
 
         date_default_timezone_set( $timezone_string );
-        $this->assertEquals( gmdate( $format ), current_time( $format, true ) );
-        $this->assertEquals( $datetime->format( $format ), current_time( $format ) );
+
+        $current_time_custom_timezone_gmt = current_time( $format, true );
+        $current_time_custom_timezone     = current_time( $format );
 
         date_default_timezone_set( 'UTC' );
-        $this->assertEquals( gmdate( $format ), current_time( $format, true ) );
-        $this->assertEquals( $datetime->format( $format ), current_time( $format ) );
+
+        $current_time_gmt = current_time( $format, true );
+        $current_time     = current_time( $format );
+
+        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( $current_time_custom_timezone_gmt ), 'The dates should be equal', 2 );
+        $this->assertEquals( strtotime( $datetime->format( $format ) ), strtotime( $current_time_custom_timezone ), 'The dates should be equal', 2 );
+        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( $current_time_gmt ), 'The dates should be equal', 2 );
+        $this->assertEquals( strtotime( $datetime->format( $format ) ), strtotime( $current_time ), 'The dates should be equal', 2 );
     }
 }