From 243d1a2e3887f3be1cc805284283e1791dc80c11 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sat, 9 Nov 2019 03:44:51 +0000
Subject: [PATCH] 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@46683 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/admin/includesPlugin.php | 6 +-----
 tests/phpunit/tests/user.php                 | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/tests/phpunit/tests/admin/includesPlugin.php b/tests/phpunit/tests/admin/includesPlugin.php
index 0a2d011176..68d8fd44b4 100644
--- a/tests/phpunit/tests/admin/includesPlugin.php
+++ b/tests/phpunit/tests/admin/includesPlugin.php
@@ -98,6 +98,7 @@ class Tests_Admin_includesPlugin extends WP_UnitTestCase {
 	 * 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 @@ class Tests_Admin_includesPlugin extends WP_UnitTestCase {
 		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
index 7d8cea6950..74c533b69d 100644
--- a/tests/phpunit/tests/user.php
+++ b/tests/phpunit/tests/user.php
@@ -576,12 +576,9 @@ class Tests_User extends WP_UnitTestCase {
 
 	/**
 	 * @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,