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

SergeyBiryukov · SergeyBiryukov · commit 243d1a2e3887 · 2019-11-09T03:44:51.000Z
See #39776, #45747. git-svn-id: https://develop.svn.wordpress.org/trunk@46683 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/tests/phpunit/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
@@ -98,6 +98,7 @@ function test_submenu_priority( $priority, $expected_position ) {
 	 * Tests the priority parameter for menu helper functions.
 	 *
 	 * @ticket 39776
+	 * @group ms-excluded
 	 *
 	 * @covers ::add_management_page
 	 * @covers ::add_options_page
@@ -120,11 +121,6 @@ function test_submenu_helpers_priority( $priority, $expected_position ) {
 		global $submenu;
 		global $menu;
 
-		// Skip for multisite.
-		if ( is_multisite() ) {
-			$this->markTestSkipped( 'This test is intended for single site.' );
-		}
-
 		// Reset menus.
 		$submenu = array();
 		$menu    = array();
diff --git a/tests/phpunit/tests/user.php b/tests/phpunit/tests/user.php
@@ -576,12 +576,9 @@ function test_wp_update_user_should_not_change_password_when_passed_WP_User_inst
 
 	/**
 	 * @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(
 				'ID'   => self::$contrib_id,
