vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-25 15:54:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.



git-svn-id: https://develop.svn.wordpress.org/trunk@39626 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2016-12-21 04:58:47 +00:00
parent 4b984b763d
commit f593d8532a
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/phpunit/includes/testcase.php
View File

@@ -57,6 +57,13 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
}
public static function setUpBeforeClass() {
global $wpdb;
$wpdb->suppress_errors = false;
$wpdb->show_errors = true;
$wpdb->db_connect();
ini_set('display_errors', 1 );
parent::setUpBeforeClass();
$c = self::get_called_class();
@@ -98,11 +105,8 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->_backup_hooks();
}
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();
/*