Changeset 48464

Timestamp:

07/14/2020 01:28:17 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace hardcoded /tmp/ references with get_temp_dir().

This allows more tests to pass on Windows.

Props danielhuesken, DJPaul, christophherr, joemcgill, netweb, davidbaumwald, SergeyBiryukov.
Fixes #40856, #39975.

Location:

trunk/tests/phpunit

Files:

• includes/abstract-testcase.php (modified) (2 diffs)
• tests/customize/manager.php (modified) (1 diff)
• tests/file.php (modified) (1 diff)
• tests/image/functions.php (modified) (8 diffs)
• tests/rest-api/rest-attachments-controller.php (modified) (1 diff)
• tests/rest-api/rest-schema-setup.php (modified) (1 diff)
• tests/upload.php (modified) (1 diff)
• tests/widgets/media-gallery-widget.php (modified) (1 diff)
• tests/widgets/media-image-widget.php (modified) (1 diff)
• tests/widgets/media-widget.php (modified) (1 diff)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -914 +914 @@
         $tmp_dir = '';
         $dirs    = array( 'TMP', 'TMPDIR', 'TEMP' );
+
         foreach ( $dirs as $dir ) {
             if ( isset( $_ENV[ $dir ] ) && ! empty( $_ENV[ $dir ] ) ) {
@@ -920 +921 @@
             }
         }
+
         if ( empty( $tmp_dir ) ) {
-            $tmp_dir = '/tmp';
-        }
+            $tmp_dir = get_temp_dir();
+        }
+
         $tmp_dir = realpath( $tmp_dir );
+
         return tempnam( $tmp_dir, 'wpunit' );
     }

trunk/tests/phpunit/tests/customize/manager.php

@@ -61 +61 @@
 
         $orig_file       = DIR_TESTDATA . '/images/canola.jpg';
-        $this->test_file = '/tmp/canola.jpg';
+        $this->test_file = canola.jpg';
         copy( $orig_file, $this->test_file );
         $orig_file2       = DIR_TESTDATA . '/images/waffles.jpg';
-        $this->test_file2 = '/tmp/waffles.jpg';
+        $this->test_file2 = waffles.jpg';
         copy( $orig_file2, $this->test_file2 );
     }

trunk/tests/phpunit/tests/file.php

@@ -9 +9 @@
         parent::setUp();
 
-        $file      = tempnam( '/tmp', 'foo' );
-        $this->dir = dirname( $file );
-        unlink( $file );
+        $this->dir = untrailingslashit( get_temp_dir() );
 
         $this->badchars = '"\'[]*&?$';

trunk/tests/phpunit/tests/image/functions.php

@@ -21 +21 @@
 
         // Ensure no legacy / failed tests detritus.
-        $folder = '/tmp/wordpress-gsoc-flyer*.{jpg,pdf}';
+        $folder = wordpress-gsoc-flyer*.{jpg,pdf}';
 
         foreach ( glob( $folder, GLOB_BRACE ) as $file ) {
@@ -426 +426 @@
 
         $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
-        $test_file = '/tmp/wordpress-gsoc-flyer.pdf';
+        $test_file = wordpress-gsoc-flyer.pdf';
         copy( $orig_file, $test_file );
 
@@ -477 +477 @@
 
         unlink( $test_file );
+
         foreach ( $metadata['sizes'] as $size ) {
-            unlink( '/tmp/' . $size['file'] );
+            unlink(  . $size['file'] );
         }
     }
@@ -561 +562 @@
 
         $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
-        $test_file = '/tmp/wordpress-gsoc-flyer.pdf';
+        $test_file = wordpress-gsoc-flyer.pdf';
         copy( $orig_file, $test_file );
 
@@ -597 +598 @@
 
         unlink( $test_file );
+
         foreach ( $metadata['sizes'] as $size ) {
-            unlink( '/tmp/' . $size['file'] );
+            unlink(  . $size['file'] );
         }
     }
@@ -619 +621 @@
         }
 
+
+
         // Dummy JPEGs.
-        $jpg1_path = '/tmp/test.jpg'; // Straight.
+        $jpg1_path = test.jpg'; // Straight.
         file_put_contents( $jpg1_path, 'asdf' );
-        $jpg2_path = '/tmp/test-pdf.jpg'; // With PDF marker.
+        $jpg2_path = test-pdf.jpg'; // With PDF marker.
         file_put_contents( $jpg2_path, 'fdsa' );
 
         // PDF with same name as JPEG.
-        $pdf_path = '/tmp/test.pdf';
+        $pdf_path = test.pdf';
         copy( DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf', $pdf_path );
 
@@ -643 +647 @@
 
         $metadata     = wp_generate_attachment_metadata( $attachment_id, $pdf_path );
-        $preview_path = '/tmp/' . $metadata['sizes']['full']['file'];
+        $preview_path =  . $metadata['sizes']['full']['file'];
 
         // PDF preview didn't overwrite PDF.
@@ -659 +663 @@
         unlink( $pdf_path );
         foreach ( $metadata['sizes'] as $size ) {
-            unlink( '/tmp/' . $size['file'] );
+            unlink(  . $size['file'] );
         }
     }

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -81 +81 @@
 
         $orig_file       = DIR_TESTDATA . '/images/canola.jpg';
-        $this->test_file = '/tmp/canola.jpg';
+        $this->test_file = canola.jpg';
         copy( $orig_file, $this->test_file );
         $orig_file2       = DIR_TESTDATA . '/images/codeispoetry.png';
-        $this->test_file2 = '/tmp/codeispoetry.png';
+        $this->test_file2 = codeispoetry.png';
         copy( $orig_file2, $this->test_file2 );
     }

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -227 +227 @@
 
         $media_id = $this->factory->attachment->create_object(
-            '/tmp/canola.jpg',
+            canola.jpg',
             0,
             array(

trunk/tests/phpunit/tests/upload.php

@@ -47 +47 @@
      */
     function test_upload_dir_absolute() {
-        $path = '/tmp/wp-unit-test';
+        $path = wp-unit-test';
 
         // wp_upload_dir() with an absolute upload path.

trunk/tests/phpunit/tests/widgets/media-gallery-widget.php

@@ -59 +59 @@
         $attachments = array();
         foreach ( array( 'canola.jpg', 'waffles.jpg' ) as $filename ) {
-            $test_image = '/tmp/' . $filename;
+            $test_image =  . $filename;
             copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
             $attachment_id = self::factory()->attachment->create_object(

trunk/tests/phpunit/tests/widgets/media-image-widget.php

@@ -413 +413 @@
         $widget = new WP_Widget_Media_Image();
 
-        $test_image = '/tmp/canola.jpg';
+        $test_image = canola.jpg';
         copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
         $attachment_id = self::factory()->attachment->create_object(

trunk/tests/phpunit/tests/widgets/media-widget.php

@@ -139 +139 @@
     function test_is_attachment_with_mime_type() {
 
-        $test_image = '/tmp/canola.jpg';
+        $test_image = canola.jpg';
         copy( DIR_TESTDATA . '/images/canola.jpg', $test_image );
         $attachment_id = self::factory()->attachment->create_object(