Changeset 54719

Timestamp:

10/29/2022 03:42:26 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove skipWithMultisite() and skipWithoutMultisite() from get_user_count() tests.

As the tests belong to either the ms-excluded or the ms-required group, the skipping should not be necessary.

While these methods were initially intended to be used in conjunction with the respective group, the PHPUnit configuration files for single site and multisite exclude these groups as appropriate, so calling these methods explicitly is no longer required.

Follow-up to [40520], [40543], [40564], [43005], [46683], [53011].

See #56793.

File:

• trunk/tests/phpunit/tests/user/getUserCount.php (modified) (6 diffs)

trunk/tests/phpunit/tests/user/getUserCount.php

@@ -12 +12 @@
          */
         public function test_wp_update_network_counts_on_different_network() {
-                $this->skipWithoutMultisite();
                 $different_network_id = self::factory()->network->create(
                         array(
@@ -35 +34 @@
          */
         public function test_get_user_count_on_different_network() {
-                $this->skipWithoutMultisite();
                 $different_network_id = self::factory()->network->create(
                         array(
@@ -61 +59 @@
          */
         public function test_enable_live_network_user_counts_filter() {
-                $this->skipWithoutMultisite();
                 // False for large networks by default.
                 add_filter( 'enable_live_network_counts', '__return_false' );
@@ -103 +100 @@
 
         /**
+         * @ticket 38741
          * @group ms-excluded
-         * @ticket 38741
          */
         public function test_get_user_count_update_on_delete() {
-                $this->skipWithMultisite();
                 wp_update_user_counts();
                 $current_network_user_count = get_user_count();
@@ -125 +121 @@
 
         /**
+         * @ticket 38741
          * @group ms-required
-         * @ticket 38741
          */
         public function test_get_user_count_update_on_delete_multisite() {
-                $this->skipWithoutMultisite();
                 wp_update_user_counts();
                 $current_network_user_count = get_user_count();
@@ -147 +142 @@
 
         /**
+         * @ticket 38741
          * @group multisite
          * @group ms-required
-         * @ticket 38741
          */
         public function test_get_user_count() {
-                $this->skipWithoutMultisite();
                 // Refresh the cache.
                 wp_update_network_counts();