Changeset 40543 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

04/23/2017 09:57:31 PM (6 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/includes/testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -195 +195 @@
         if ( false !== $travis_pull_request && 'master' !== $travis_branch ) {
             $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
+        }
+    }
+
+    /**
+     * Allow tests to be skipped when Multisite is not in use.
+     *
+     * Use in conjunction with the ms-required group.
+     */
+    public function skipWithoutMultisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test only runs on Multisite' );
+        }
+    }
+
+    /**
+     * Allow tests to be skipped when Multisite is in use.
+     *
+     * Use in conjunction with the ms-excluded group.
+     */
+    public function skipWithMultisite() {
+        if ( is_multisite() ) {
+            $this->markTestSkipped( 'Test does not run on Multisite' );
         }
     }