Changeset 47314

Timestamp:

02/19/2020 02:54:55 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use delta comparison in test_site_dates_are_gmt() to avoid race conditions.

Merges [47313] to the 5.3 branch.
See #40364.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/multisite/site.php (modified) (3 diffs)

branches/5.3/tests/phpunit/tests/multisite/site.php

@@ -406 +406 @@
                         wpmu_update_blogs_date();
 
-                        // compare the update time with the current time, allow delta < 2
-                        $blog            = get_site( get_current_blog_id() );
-                        $current_time    = time();
-                        $time_difference = $current_time - strtotime( $blog->last_updated );
-                        $this->assertLessThan( 2, $time_difference );
+                        $blog         = get_site( get_current_blog_id() );
+                        $current_time = time();
+
+                        // Compare the update time with the current time, allow delta < 2.
+                        $this->assertEquals( $current_time, strtotime( $blog->last_updated ), 'The dates should be equal', 2 );
                 }
 
@@ -1769 +1769 @@
 
                         $site = get_site( $site_id );
-                        $this->assertSame( $first_date, $site->registered );
-                        $this->assertSame( $first_date, $site->last_updated );
+                        $this->assertSame( strtotime( $first_date ), strtotime( $site->registered ), 'The dates should be equal', 2 );
+                        $this->assertSame( strtotime( $first_date ), strtotime( $site->last_updated ), 'The dates should be equal', 2 );
 
                         $second_date = current_time( 'mysql', true );
@@ -1777 +1777 @@
 
                         $site = get_site( $site_id );
-                        $this->assertSame( $first_date, $site->registered );
-                        $this->assertSame( $second_date, $site->last_updated );
+                        $this->assertSame( strtotime( $first_date ), strtotime( $site->registered ), 'The dates should be equal', 2 );
+                        $this->assertSame( strtotime( $second_date ), strtotime( $site->last_updated ), 'The dates should be equal', 2 );
                 }