Changeset 34719

Timestamp:

09/30/2015 01:08:49 PM (8 years ago)

Author:

boonebgorges

Message:

Prevent Multisite term tests from hitting database for 'db_version'.

[34718] introduced a 'db_version' check to term meta functions, to ensure that
they don't run when the term meta schema is not yet in place. This call to
get_option() causes a database hit during Multisite tests, due to the
presence of the WP_INSTALLING constant. See #31130. The extra database
queries are causing cache tests to fail.

In similar cases, we have markTestSkipped() when is_multisite(). Because
the term meta API is so extensive - term meta caches can be primed anywhere a
WP_Query loop is fired up - we implement a more generous workaround in this
case. To prevent get_option( 'db_version' ) from hitting the database during
multisite unit tests, we use a 'pre_option_' filter.

Heaven help us.

See #34091.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (2 diffs)
• tests/term/wpInsertTerm.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -56 +56 @@
 
         add_filter( 'wp_mail', array( $this, 'set_wp_mail_globals' ) );
+
+        /*
+         * During multisite tests, WP_INSTALLING forces `get_option()` to miss the cache, which causes problems
+         * with our query-counting cache tests. As a workaround in the case of tests that require checking
+         * 'db_version' (such as any test that uses the Term Meta API), we filter 'pre_option_db_version' and
+         * avoid hitting the database.
+         *
+         * See #31130.
+         */
+        if ( is_multisite() ) {
+            $this->db_version = get_option( 'db_version' );
+            add_filter( 'pre_option_db_version', array( $this, 'db_version' ) );
+        }
     }
 
@@ -618 +631 @@
         }
     }
+
+    /**
+     * Return the current database version without hitting the database.
+     *
+     * This is used to bypass cache problems with some multisite tests. See #31130.
+     *
+     * @todo Don't do this anymore once #31130 is fixed.
+     *
+     * @since 4.4.0
+     */
+    public function db_version() {
+        return $this->db_version;
+    }
 }

trunk/tests/phpunit/tests/term/wpInsertTerm.php

@@ -470 +470 @@
     public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() {
 
-        $db_version = get_option( 'db_version' );
-        update_option( 'db_version', 30055 );
+        $_db_version = $this->db_version;
+        $this->db_version = 30055;
 
         register_taxonomy( 'wptests_tax', 'post' );
@@ -498 +498 @@
         $this->assertNotEquals( $new_term->term_id, $term->term_id );
 
+        $this->db_version = $_db_version;
         _unregister_taxonomy( 'wptests_tax', 'post' );
-        update_option( 'db_version', $db_version );
     }