Changeset 40543 for trunk/tests/phpunit/tests/rewrite.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/rewrite.php (modified) (2 diffs)

trunk/tests/phpunit/tests/rewrite.php

@@ -123 +123 @@
      */
     function test_url_to_postid_of_http_site_when_current_site_uses_https() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'This test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $_SERVER['HTTPS'] = 'on';
@@ -320 +318 @@
      */
     function test_url_to_postid_ms_home_url_collision() {
-
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'test_url_to_postid_ms_home_url_collision requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $blog_id = self::factory()->blog->create( array( 'path' => '/example' ) );