Changeset 40543 for trunk/tests/phpunit/tests/functions.php

Timestamp:

04/23/2017 09:57:31 PM (9 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/functions.php (modified) (2 diffs)

trunk/tests/phpunit/tests/functions.php

@@ -939 +939 @@
      */
     function test_wp_check_filetype_and_ext_with_filtered_svg() {
+        $this->skipWithMultisite();
+
         if ( ! extension_loaded( 'fileinfo' ) ) {
             $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
-        }
-
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
         }
 
@@ -965 +963 @@
     /**
      * @ticket 39550
+     * @group ms-excluded
      */
     function test_wp_check_filetype_and_ext_with_filtered_woff() {
+        $this->skipWithMultisite();
+
         if ( ! extension_loaded( 'fileinfo' ) ) {
             $this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
-        }
-
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
         }