From 2f9a63bf8707dc8a2767c3b3e9057e2280560e8c Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremyfelt@git.wordpress.org>
Date: Fri, 14 Dec 2018 00:57:50 +0000
Subject: [PATCH] REST API: Restore Autosaves controller test for multisite.

PHPUnit 3.6.x requires `exclude` and `file` paths to be relative to the checkout root.

PHPUnit 4.0.0+ requires the paths to be relative to the configuration file.

Merges [43774] from the 5.0 branch to trunk.

See #45131.


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

diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index d8aa698e36..bcfc440a4a 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -15,15 +15,22 @@
             <exclude>tests/phpunit/tests/image/editor.php</exclude>
             <exclude>tests/phpunit/tests/image/editorGd.php</exclude>
             <exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
-            <!-- DOING_AUTOSAVE constant pollutes test suite -->
-            <!-- and there is a weird 5.2 edge case: https://core.trac.wordpress.org/ticket/45132 -->
-            <exclude>tests/rest-api/rest-autosaves-controller.php</exclude>
+            <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
             <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
+            <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
+            <exclude>tests/rest-api/rest-autosaves-controller.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/editorGd.php</file>
             <file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
         </testsuite>
+        <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
+        <testsuite name="restapi-autosave">
+            <!-- Path relative to the checkout root, for PHPUnit 3.6.x -->
+            <file>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</file>
+            <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
+            <file>tests/rest-api/rest-autosaves-controller.php</file>
+        </testsuite>
     </testsuites>
     <groups>
         <exclude>