Changeset 43005

Timestamp:

04/25/2018 10:37:08 PM (6 years ago)

Author:

flixos90

Message:

Tests: Skip multisite-only or single site-only tests correctly based on test doc annotations.

Without the ms-required and ms-excluded groups being marked as excluded in the PHPUnit configurations for the project, those groups were still executed, causing fatal errors. Checking against the groups in the correct structure of the array returned from PHPUnit's Testcase::getAnnotations() ensures that those tests are skipped properly.

Fixes #43863.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -655 +655 @@
         $annotations = $this->getAnnotations();
 
-        if ( ! empty( $annotations['group'] ) ) {
-            if ( in_array( 'ms-required', $annotations['group'], true ) ) {
+        $groups = array();
+        if ( ! empty( $annotations['class']['group'] ) ) {
+            $groups = array_merge( $groups, $annotations['class']['group'] );
+        }
+        if ( ! empty( $annotations['method']['group'] ) ) {
+            $groups = array_merge( $groups, $annotations['method']['group'] );
+        }
+
+        if ( ! empty( $groups ) ) {
+            if ( in_array( 'ms-required', $groups, true ) ) {
                 $this->skipWithoutMultisite();
             }
-            if ( in_array( 'ms-excluded', $annotations['group'], true ) ) {
+
+            if ( in_array( 'ms-excluded', $groups, true ) ) {
                 $this->skipWithMultisite();
             }