Changeset 39626

Timestamp:

12/21/2016 04:58:47 AM (8 years ago)

Author:

pento

Message:

Tests: Restore the database connection earlier when switching test groups.

When plugins don't disable the backupGlobals PHPUnit option in their own tests, $wpdb is backed up and restored between classes of tests. The serialisation process used for this broke the database connection. This previously wasn't a problem, as it was reconnecting before each test.

[38398] introduced some changes that required the connection to be available in setUpBeforeClass(), earlier than in was previously reconnecting. This didn't cause warnings in Core, but it did cause warnings for plugins that don't disable the backupGlobals option.

The database connection now reconnects in setUpBeforeClass(). This change also fixes a few Core tests that weren't calling parent::setUpBeforeClass() or parent::tearDown() correctly.

Fixes #39327.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (2 diffs)
• includes/utils.php (modified) (1 diff)
• tests/db.php (modified) (2 diffs)
• tests/db/charset.php (modified) (1 diff)
• tests/rewrite/numericSlugs.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -58 +58 @@
 
     public static function setUpBeforeClass() {
+        global $wpdb;
+
+        $wpdb->suppress_errors = false;
+        $wpdb->show_errors = true;
+        $wpdb->db_connect();
+        ini_set('display_errors', 1 );
+
         parent::setUpBeforeClass();
 
@@ -99 +106 @@
         }
 
-        global $wpdb, $wp_rewrite;
-        $wpdb->suppress_errors = false;
-        $wpdb->show_errors = true;
-        $wpdb->db_connect();
-        ini_set('display_errors', 1 );
+        global $wp_rewrite;
+
         $this->clean_up_global_scope();
 

trunk/tests/phpunit/includes/utils.php

@@ -390 +390 @@
         $this->field_types = $wpdb->field_types;
         $this->charset = $wpdb->charset;
+
+        $this->dbuser = $wpdb->dbuser;
+        $this->dbpassword = $wpdb->dbpassword;
+        $this->dbname = $wpdb->dbname;
+        $this->dbhost = $wpdb->dbhost;
     }
 

trunk/tests/phpunit/tests/db.php

@@ -21 +21 @@
 
     public static function setUpBeforeClass() {
+        parent::setUpBeforeClass();
         self::$_wpdb = new wpdb_exposed_methods_for_testing();
     }
@@ -64 +65 @@
 
         $var = $wpdb->get_var( "SELECT ID FROM $wpdb->users LIMIT 1" );
+
+        // Ensure all database handles have been properly reconnected after this test.
+        $wpdb->db_connect();
+        self::$_wpdb->db_connect();
+
         $this->assertGreaterThan( 0, $var );
     }

trunk/tests/phpunit/tests/db/charset.php

@@ -23 +23 @@
 
     public static function setUpBeforeClass() {
+        parent::setUpBeforeClass();
+
         require_once( dirname( dirname( __FILE__ ) ) . '/db.php' );
 

trunk/tests/phpunit/tests/rewrite/numericSlugs.php

@@ -17 +17 @@
 
     public function tearDown() {
+        parent::tearDown();
         remove_filter( 'wp_unique_post_slug', array( $this, 'filter_unique_post_slug' ), 10, 6 );
     }