Changeset 40520 for trunk/tests/phpunit/tests/user/capabilities.php

Timestamp:

04/22/2017 06:58:46 PM (9 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Introduce ms-required and ms-excluded groups for tests.

Tests in the ms-excluded group are now excluded when running tests with multisite enabled, and tests in the ms-required group are excluded when running tests without multisite enabled. The end result is a significantly reduced number of skipped tests polluting PHPUnit's output, which means verbose mode can be used to more easily see which tests are skipped or incomplete, and why.

See #40531

File:

• trunk/tests/phpunit/tests/user/capabilities.php (modified) (8 diffs)

trunk/tests/phpunit/tests/user/capabilities.php

@@ -612 +612 @@
     }
 
+    /**
+     * @group ms-required
+     */
     function test_super_admin_caps() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( 'Test only runs in multisite' );
-            return;
         }
         $caps = $this->getAllCapsAndRoles();
@@ -1356 +1358 @@
     }
 
+    /**
+     * @group ms-required
+     */
     function test_borked_current_user_can_for_blog() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( 'Test only runs in multisite' );
-            return;
         }
 
@@ -1417 +1421 @@
     }
 
+    /**
+     * @group ms-required
+     */
     function test_multisite_administrator_can_not_edit_users() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( 'Test only runs in multisite' );
-            return;
         }
 
@@ -1451 +1457 @@
     }
 
+    /**
+     * @group ms-required
+     */
     public function test_only_super_admins_can_delete_users_on_multisite() {
         if ( ! is_multisite() ) {
@@ -1465 +1474 @@
     }
 
+    /**
+     * @group ms-excluded
+     */
     public function test_only_admins_can_delete_users_on_single_site() {
         if ( is_multisite() ) {
@@ -1523 +1535 @@
     }
 
+    /**
+     * @group ms-required
+     */
     function test_multisite_administrator_with_manage_network_users_can_edit_users() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( 'Test only runs in multisite' );
-            return;
         }
 
@@ -1542 +1556 @@
     }
 
+    /**
+     * @group ms-required
+     */
     function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
         if ( ! is_multisite() ) {
             $this->markTestSkipped( 'Test only runs in multisite' );
-            return;
         }
 
@@ -1765 +1781 @@
     /**
      * @ticket 39063
+     * @group ms-required
      */
     public function test_only_super_admins_can_remove_themselves_on_multisite() {