Build/Test Tools: Introduce skipWithoutMultisite() and skipWithMultisite() methods into the test suite.

This brings much needed uniformity to test skipping when a test requires Multisite or when a test should be excluded from running when Multisite is enabled.

Used in conjunction with the `@group ms-required` and `@group ms-excluded` notation, this removes a significant number of skipped tests from the default test suite run.

Fixes #40531


git-svn-id: https://develop.svn.wordpress.org/trunk@40543 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2017-04-23 21:57:31 +00:00
parent e3a9d87083
commit 64f8351da1
20 changed files with 106 additions and 238 deletions
+2 -8
View File
@@ -12,10 +12,7 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_count_users_is_accurate( $strategy ) {
if ( is_multisite() ) {
$this->markTestSkipped( 'Test does not run on multisite' );
}
$this->skipWithMultisite();
// Setup users
$admin = self::factory()->user->create( array(
@@ -63,10 +60,7 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
* @dataProvider data_count_users_strategies
*/
public function test_count_users_multisite_is_accurate( $strategy ) {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'Test requires multisite' );
}
$this->skipWithoutMultisite();
// Setup users
$admin = self::factory()->user->create( array(