Changeset 47490 for branches/3.9

Timestamp:

03/22/2020 02:43:22 PM (5 years ago)

Author:

SergeyBiryukov

Message:

When asserting microtime output as a number, make it a number.

microtime is by default a string. Doing a greater then or less than check of that string is a bad idea since it uses the first part (the micro part of microtime) rather then the actual time. This adds a helper to convert microtime output into a float which we can then use to properly compare the output of microtime.

This fixes an intermittent test failure.

Props jorbin.
Merges [30337] to the 3.9 branch.
See #30336, #49485.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• tests/phpunit/includes/testcase.php (modified) (2 diffs)
• tests/phpunit/tests/post/getPages.php (modified) (1 diff)

branches/3.9/tests/phpunit/includes/testcase.php

@@ -166 +166 @@
         }
     }
-    
+
     function flush_cache() {
         global $wp_object_cache;
@@ -506 +506 @@
         return $files;
     }
+
+    /**
+     * Helper to Convert a microtime string into a float
+     */
+    protected function _microtime_to_float($microtime ){
+        $time_array = explode( ' ', $microtime );
+        return array_sum( $time_array );
+    }
 }

branches/3.9/tests/phpunit/tests/post/getPages.php

@@ -80 +80 @@
         // This should bump last_changed.
         wp_delete_post( $pages[0]->ID );
-        $this->assertGreaterThan( $last_changed, wp_cache_get( 'last_changed', 'posts' ) );
+        $old_changed_float = $this->_microtime_to_float( $last_changed );
+        $new_changed_float = $this->_microtime_to_float( wp_cache_get( 'last_changed', 'posts' ) );
+        $this->assertGreaterThan( $old_changed_float, $new_changed_float );
 
         $num_queries = $wpdb->num_queries;