From 963e92a7dcb147fda50413ef000ce2318e0823e7 Mon Sep 17 00:00:00 2001
From: Aaron Jorbin <jorbin@git.wordpress.org>
Date: Mon, 28 Sep 2015 02:36:23 +0000
Subject: [PATCH] Exclude external HTTP tests from multisite run

In [30298] the unit tests default confirguration was modified to exclude external-http tests.  This change was never migrated to the multisite XML configuration. The external HTTP code doesn't follow different logic in multisite, so the logic to exclude the tests then ( The external-http tests are very slow, and Wp_Http functionality is fairly isolated ) holds true here as well.

See #33968


git-svn-id: https://develop.svn.wordpress.org/trunk@34656 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/multisite.xml | 65 +++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index 3141ade2e4..63b5f7696c 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -1,32 +1,33 @@
-<phpunit
-		bootstrap="includes/bootstrap.php"
-        backupGlobals="false"
-        colors="true"
-        >
-    <php>
-        <const name="WP_TESTS_MULTISITE" value="1" />
-    </php>
-    <testsuites>
-        <!-- Default test suite to run all tests -->
-        <testsuite>
-            <directory suffix=".php">tests</directory>
-            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>
-            <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>
-            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>ajax</group>
-            <group>ms-files</group>
-        </exclude>
-    </groups>
-    <php>
-        <const name="WP_RUN_CORE_TESTS" value="1" />
-    </php>
-</phpunit>
+<phpunit
+		bootstrap="includes/bootstrap.php"
+        backupGlobals="false"
+        colors="true"
+        >
+    <php>
+        <const name="WP_TESTS_MULTISITE" value="1" />
+    </php>
+    <testsuites>
+        <!-- Default test suite to run all tests -->
+        <testsuite>
+            <directory suffix=".php">tests</directory>
+            <exclude>tests/phpunit/tests/actions/closures.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor_gd.php</exclude>
+            <exclude>tests/phpunit/tests/image/editor_imagick.php</exclude>
+            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_gd.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor_imagick.php</file>
+        </testsuite>
+    </testsuites>
+    <groups>
+        <exclude>
+            <group>ajax</group>
+            <group>ms-files</group>
+            <group>external-http</group>
+        </exclude>
+    </groups>
+    <php>
+        <const name="WP_RUN_CORE_TESTS" value="1" />
+    </php>
+</phpunit>