Changeset 45857 for trunk/tests/phpunit/tests/date/currentTime.php

Timestamp:

08/20/2019 01:34:37 AM (7 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.
Fixes #45821.

File:

• trunk/tests/phpunit/tests/date/currentTime.php (modified) (5 diffs)

trunk/tests/phpunit/tests/date/currentTime.php

@@ -17 +17 @@
 
                 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 );
         }
 
@@ -30 +37 @@
         public function test_should_return_wp_timestamp() {
                 update_option( 'timezone_string', 'Europe/Kiev' );
+
                 $timestamp = time();
                 $datetime  = new DateTime( '@' . $timestamp );
@@ -35 +43 @@
                 $wp_timestamp = $timestamp + $datetime->getOffset();
 
-                $this->assertEquals( $timestamp, current_time( 'timestamp', true ), '', 2 );
-                $this->assertEquals( $timestamp, current_time( 'U', true ), '', 2 );
-                $this->assertEquals( $wp_timestamp, current_time( 'timestamp' ), '', 2 );
-                $this->assertEquals( $wp_timestamp, current_time( 'U' ), '', 2 );
+                $this->assertEquals( $timestamp, current_time( 'timestamp', true ), 'The dates should be equal', 2 );
+                $this->assertEquals( $timestamp, current_time( 'U', true ), 'The dates should be equal', 2 );
+
+                $this->assertEquals( $wp_timestamp, current_time( 'timestamp' ), 'The dates should be equal', 2 );
+                $this->assertEquals( $wp_timestamp, current_time( 'U' ), 'The dates should be equal', 2 );
+
                 $this->assertInternalType( 'int', current_time( 'timestamp' ) );
         }
@@ -47 +57 @@
         public function test_should_return_correct_local_time() {
                 update_option( 'timezone_string', 'Europe/Kiev' );
+
                 $timestamp      = time();
                 $datetime_local = new DateTime( '@' . $timestamp );
@@ -53 +64 @@
                 $datetime_utc->setTimezone( new DateTimeZone( 'UTC' ) );
 
-                $this->assertEquals( $datetime_local->format( DATE_W3C ), current_time( DATE_W3C ), '', 2 );
-                $this->assertEquals( $datetime_utc->format( DATE_W3C ), current_time( DATE_W3C, true ), '', 2 );
+                $this->assertEquals( strtotime( $datetime_local->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C ) ), 'The dates should be equal', 2 );
+                $this->assertEquals( strtotime( $datetime_utc->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C, true ) ), 'The dates should be equal', 2 );
         }
 }