Changeset 51616

Timestamp:

08/15/2021 01:39:47 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Date/Time: Use delta comparison in get_gmt_from_date() tests to avoid race conditions.

Follow-up to [35284].

Props keesiemeijer.
Merges [41920] to the 4.4 branch.
See #38815.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/formatting/date.php (modified) (2 diffs)

branches/4.4/tests/phpunit/tests/formatting/date.php

@@ -82 +82 @@
         update_option( 'timezone_string', 'Europe/London' );
         $local = 'now';
-        $gmt = gmdate( 'Y-m-d H:i:s', strtotime( 'now' ) );
-        $this->assertEquals( $gmt, get_gmt_from_date( $local ) );
+        $gmt = gmdate( 'Y-m-d H:i:s' );
+        $this->assertEquals( strtotime( $gmt ), strtotime( get_gmt_from_date( $local ) ), 'The dates should be equal', 2 );
     }
 
@@ -91 +91 @@
     function test_get_gmt_from_date_string_date_no_timezone() {
         $local = 'now';
-        $gmt = gmdate( 'Y-m-d H:i:s', strtotime( 'now' ) );
-        $this->assertEquals( $gmt, get_gmt_from_date( $local ) );
+        $gmt = gmdate( 'Y-m-d H:i:s' );
+        $this->assertEquals( strtotime( $gmt ), strtotime( get_gmt_from_date( $local ) ), 'The dates should be equal', 2 );
     }
 }