Changeset 44442

Timestamp:

01/07/2019 09:41:40 PM (6 years ago)

Author:

joemcgill

Message:

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.

File:

• trunk/tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/tests/phpunit/tests/functions.php

@@ -1357 +1357 @@
                 ),
             ),
-            // 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,
-                ),
-            ),
         );
 
@@ -1423 +1394 @@
                         ),
                     ),
+                    // 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,
+                        ),
+                    ),
                 )
             );