Changeset 40566 for branches/4.0

Timestamp:

05/01/2017 11:42:16 PM (9 years ago)

Author:

johnbillion

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.

See #30336

Merges [30337] to the 4.0 branch.

Location:

branches/4.0/tests/phpunit

Files:

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

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

@@ -125 +125 @@
                 }
         }
-        
+
         function flush_cache() {
                 global $wp_object_cache;
@@ -447 +447 @@
                 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/4.0/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;