vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Move the global permalinks reset routine to only fire when running core tests.

Browse Source 
Should fix intermittent mysqli response errors in the AJAX tests.

See #33968.


git-svn-id: https://develop.svn.wordpress.org/trunk@34803 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Drew Jaynes 2015-10-03 18:35:58 +00:00
parent adffdab161
commit 9cdffaaed8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->factory = new WP_UnitTest_Factory;
$this->clean_up_global_scope();
self::$default_permalink_structure = get_option( 'permalink_structure' );
/*
* When running core tests, ensure that post types and taxonomies
* are reset for each test. We skip this step for non-core tests,
@ -52,6 +54,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->reset_post_types();
$this->reset_taxonomies();
$this->reset_post_statuses();
$this->reset_permalinks();
}
$this->start_transaction();
@ -72,10 +75,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
if ( is_multisite() ) {
add_filter( 'pre_option_db_version', array( $this, 'db_version' ) );
}
self::$default_permalink_structure = get_option( 'permalink_structure' );
$this->reset_permalinks();
}
/**