Changeset 30298

Timestamp:

11/10/2014 02:48:28 PM (10 years ago)

Author:

boonebgorges

Message:

Exclude external-http tests when running phpunit.

The external-http tests are very slow, and Wp_Http functionality is fairly
isolated, so the benefits of skipping these tests by default outweigh the
risks.

A grunt phpunit:external-http subtask has been added, to ensure that the
tests are executed during exhaustive runs of the test suite, such as in
continuous integration.

Fixes #30304.

Location:

trunk

Files:

• Gruntfile.js (modified) (2 diffs)
• phpunit.xml.dist (modified) (1 diff)
• tests/phpunit/includes/bootstrap.php (modified) (2 diffs)

trunk/Gruntfile.js

@@ -329 +329 @@
                 cmd: 'phpunit',
                 args: ['-c', 'tests/phpunit/multisite.xml']
+            },
+            'external-http': {
+                cmd: 'phpunit',
+                args: ['-c', 'phpunit.xml.dist', '--group', 'external-http']
             }
         },
@@ -483 +487 @@
 
     // Testing tasks.
-    grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax and multisite tests.', function() {
+    grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax, external-http, and multisite tests.', function() {
         grunt.util.spawn({
             cmd: this.data.cmd,

trunk/phpunit.xml.dist

@@ -21 +21 @@
         <exclude>
             <group>ajax</group>
+            <group>external-http</group>
         </exclude>
     </groups>

trunk/tests/phpunit/includes/bootstrap.php

@@ -129 +129 @@
         }
 
-        $ajax_message = true;
-        $ms_files_message = true;
+        $skipped_groups = array(
+            'ajax' => true,
+            'ms-files' => true,
+            'external-http' => true,
+        );
+
         foreach ( $options as $option ) {
             switch ( $option[0] ) {
                 case '--exclude-group' :
-                    $ajax_message = false;
-                    $ms_files_message = false;
+                    foreach ( $skipped_groups as $group_name => $skipped ) {
+                        $skipped_groups[ $group_name ] = false;
+                    }
                     continue 2;
                 case '--group' :
@@ -144 +149 @@
                         }
                     }
-                    $ajax_message = ! in_array( 'ajax', $groups );
-                    $ms_files_message = ! in_array( 'ms-files', $groups );
+
+                    foreach ( $skipped_groups as $group_name => $skipped ) {
+                        if ( in_array( $group_name, $groups ) ) {
+                            $skipped_groups[ $group_name ] = false;
+                        }
+                    }
                     continue 2;
             }
         }
-        if ( $ajax_message ) {
-            echo "Not running ajax tests... To execute these, use --group ajax." . PHP_EOL;
-        }
-        if ( $ms_files_message ) {
-            echo "Not running ms_files_rewriting tests... To execute these, use --group ms-files." . PHP_EOL;
+
+        $skipped_groups = array_filter( $skipped_groups );
+        foreach ( $skipped_groups as $group_name => $skipped ) {
+            echo sprintf( 'Not running %1$s tests. To execute these, use --group %1$s.', $group_name ) . PHP_EOL;
         }
     }