Changeset 34720

Timestamp:

09/30/2015 01:27:09 PM (9 years ago)

Author:

boonebgorges

Message:

Fix db_version juggling during non-multisite tests.

Continuing with the "code is poetry" theme after [34719], we need to continue
to update the option in the database on non-multisite in this
wp_insert_term() test.

See #31130.

Location:

trunk/tests/phpunit

Files:

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

trunk/tests/phpunit/includes/testcase.php

@@ -14 +14 @@
     protected static $hooks_saved = array();
     protected static $ignore_files;
+
+    protected $db_version;
 
     /**
@@ -65 +67 @@
          * See #31130.
          */
+        $this->db_version = get_option( 'db_version' );
         if ( is_multisite() ) {
-            $this->db_version = get_option( 'db_version' );
             add_filter( 'pre_option_db_version', array( $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 = $this->db_version;
-        $this->db_version = 30055;
+        // See #31130.
+        $old_db_version = 30055;
+        if ( is_multisite() ) {
+            $_db_version = $this->db_version;
+            $this->db_version = $old_db_version;
+        } else {
+            update_option( 'db_version', $old_db_version );
+        }
 
         register_taxonomy( 'wptests_tax', 'post' );
@@ -498 +504 @@
         $this->assertNotEquals( $new_term->term_id, $term->term_id );
 
-        $this->db_version = $_db_version;
+        if ( is_multisite() ) {
+            $this->db_version = $_db_version;
+        }
+
         _unregister_taxonomy( 'wptests_tax', 'post' );
     }