From 54fd47e1f1ccf9f267391689d060c121059a43d6 Mon Sep 17 00:00:00 2001
From: Joe McGill <joemcgill@git.wordpress.org>
Date: Mon, 7 Jan 2019 21:41:40 +0000
Subject: [PATCH] Upload: Don't run some upload tests on multisite.

This moves several unit tests added in [44438] so they aren't run during multisite tests.

See #45615.


git-svn-id: https://develop.svn.wordpress.org/trunk@44442 602fd350-edb4-49c9-b593-d223f7449a82
---
 tests/phpunit/tests/functions.php | 58 +++++++++++++++----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
index c7c0b2d1ab..dd908dfcf7 100644
--- a/tests/phpunit/tests/functions.php
+++ b/tests/phpunit/tests/functions.php
@@ -1356,35 +1356,6 @@ class Tests_Functions extends WP_UnitTestCase {
 					'proper_filename' => false,
 				),
 			),
-			// Assorted text/* sample files
-			array(
-				DIR_TESTDATA . '/uploads/test.vtt',
-				'test.vtt',
-				array(
-					'ext'             => 'vtt',
-					'type'            => 'text/vtt',
-					'proper_filename' => false,
-				),
-			),
-			array(
-				DIR_TESTDATA . '/uploads/test.csv',
-				'test.csv',
-				array(
-					'ext'             => 'csv',
-					'type'            => 'text/csv',
-					'proper_filename' => false,
-				),
-			),
-			// RTF files.
-			array(
-				DIR_TESTDATA . '/uploads/test.rtf',
-				'test.rtf',
-				array(
-					'ext'             => 'rtf',
-					'type'            => 'application/rtf',
-					'proper_filename' => false,
-				),
-			),
 		);
 
 		// Test a few additional file types on single sites.
@@ -1422,6 +1393,35 @@ class Tests_Functions extends WP_UnitTestCase {
 							'proper_filename' => false,
 						),
 					),
+					// Assorted text/* sample files
+					array(
+						DIR_TESTDATA . '/uploads/test.vtt',
+						'test.vtt',
+						array(
+							'ext'             => 'vtt',
+							'type'            => 'text/vtt',
+							'proper_filename' => false,
+						),
+					),
+					array(
+						DIR_TESTDATA . '/uploads/test.csv',
+						'test.csv',
+						array(
+							'ext'             => 'csv',
+							'type'            => 'text/csv',
+							'proper_filename' => false,
+						),
+					),
+					// RTF files.
+					array(
+						DIR_TESTDATA . '/uploads/test.rtf',
+						'test.rtf',
+						array(
+							'ext'             => 'rtf',
+							'type'            => 'application/rtf',
+							'proper_filename' => false,
+						),
+					),
 				)
 			);
 		}