Changeset 35148

Timestamp:

10/13/2015 08:44:16 PM (9 years ago)

Author:

ocean90

Message:

Improve [35146] to only skip pluggable function signature tests for wp-includes/cache.php when an external object cache is in use.

See #31491, #33867.

File:

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

trunk/tests/phpunit/tests/pluggable.php

@@ -15 +15 @@
      */
     public function testPluggableFunctionSignaturesMatch( $function ) {
-
-        if ( wp_using_ext_object_cache() ) {
-            // #31491
-            $this->markTestSkipped( 'Pluggable function signatures are not tested when an external object cache is in use.' );
-        }
 
         $signatures = $this->getPluggableFunctionSignatures();
@@ -92 +87 @@
         $test_files = array(
             'wp-includes/pluggable.php',
-            'wp-includes/cache.php',
         );
+
+        // Pluggable function signatures are not tested when an external object cache is in use. #31491
+        if ( ! wp_using_ext_object_cache() ) {
+            $test_files[] = 'wp-includes/cache.php';
+        }
+
         $data = array();
 
@@ -123 +123 @@
     public function getPluggableFunctionSignatures() {
 
-        return array(
+        $signatures = array(
 
             // wp-includes/pluggable.php:
@@ -166 +166 @@
             'wp_text_diff'                    => array( 'left_string', 'right_string', 'args' => null ),
 
-            // wp-includes/cache.php:
-            'wp_cache_add'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-            'wp_cache_close'                     => array(),
-            'wp_cache_decr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
-            'wp_cache_delete'                    => array( 'key', 'group' => '' ),
-            'wp_cache_flush'                     => array(),
-            'wp_cache_get'                       => array( 'key', 'group' => '', 'force' => false, 'found' => null ),
-            'wp_cache_incr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
-            'wp_cache_init'                      => array(),
-            'wp_cache_replace'                   => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-            'wp_cache_set'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-            'wp_cache_switch_to_blog'            => array( 'blog_id' ),
-            'wp_cache_add_global_groups'         => array( 'groups' ),
-            'wp_cache_add_non_persistent_groups' => array( 'groups' ),
-            'wp_cache_reset'                     => array(),
-
             // wp-admin/includes/schema.php:
             'install_network'                    => array(),
@@ -191 +175 @@
             'wp_upgrade'                         => array(),
             'install_global_terms'               => array(),
-
         );
 
+        // Pluggable function signatures are not tested when an external object cache is in use. #31491
+        if ( ! wp_using_ext_object_cache() ) {
+            $signatures = array_merge( $signatures, array(
+
+                // wp-includes/cache.php:
+                'wp_cache_add'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                'wp_cache_close'                     => array(),
+                'wp_cache_decr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
+                'wp_cache_delete'                    => array( 'key', 'group' => '' ),
+                'wp_cache_flush'                     => array(),
+                'wp_cache_get'                       => array( 'key', 'group' => '', 'force' => false, 'found' => null ),
+                'wp_cache_incr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
+                'wp_cache_init'                      => array(),
+                'wp_cache_replace'                   => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                'wp_cache_set'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                'wp_cache_switch_to_blog'            => array( 'blog_id' ),
+                'wp_cache_add_global_groups'         => array( 'groups' ),
+                'wp_cache_add_non_persistent_groups' => array( 'groups' ),
+                'wp_cache_reset'                     => array(),
+            ) );
+        }
+
+        return $signatures;
     }