Changeset 40543 for trunk/tests/phpunit/tests/user/countUsers.php

Timestamp:

04/23/2017 09:57:31 PM (8 years ago)

Author:

johnbillion

Message:

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

File:

• trunk/tests/phpunit/tests/user/countUsers.php (modified) (2 diffs)

trunk/tests/phpunit/tests/user/countUsers.php

@@ -13 +13 @@
      */
     public function test_count_users_is_accurate( $strategy ) {
-
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run on multisite' );
-        }
+        $this->skipWithMultisite();
 
         // Setup users
@@ -64 +61 @@
      */
     public function test_count_users_multisite_is_accurate( $strategy ) {
-
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         // Setup users