Changeset 46683

Timestamp:

11/09/2019 03:44:51 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Test: Don't skip the tests intended for single site when running on Multisite, add them to the ms-excluded group instead.

See #39776, #45747.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesPlugin.php (modified) (2 diffs)
• user.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -99 +99 @@
          *
          * @ticket 39776
+         * @group ms-excluded
          *
          * @covers ::add_management_page
@@ -120 +121 @@
                 global $submenu;
                 global $menu;
-
-                // Skip for multisite.
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'This test is intended for single site.' );
-                }
 
                 // Reset menus.

trunk/tests/phpunit/tests/user.php

@@ -577 +577 @@
         /**
          * @ticket 45747
+         * @group ms-excluded
          */
         function test_wp_update_user_should_not_mark_user_as_spam_on_single_site() {
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( 'This test is intended for single site.' );
-                }
-
                 $u = wp_update_user(
                         array(