Changeset 47338 for branches/3.8/tests/phpunit/tests/image/editor_gd.php

Timestamp:

02/21/2020 01:05:39 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Fix the Travis CI build for the 3.8 branch.

Among other fixes, this backports [26871], [26909-26910], [26940], [27086], [27168], [28799], [28873], [28943], [28961], [28964], [28966-28967], [29120], [29251], [29503], [29860], [29869], [29954], [30001], [30160], [30282], [30285], [30289-30291], [30513-30514], [30516-30521], [30524], [30526], [30529-30530], [31253-31254], [31257-31259], [31622], [40241], [40255], [40257], [40259], [40269], [40271], [40446], [40449], [40457], [40604], [40538], [40833], [41082], [41303], [41306], [44993].

See #49485.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/image/editor_gd.php (modified) (4 diffs)

branches/3.8/tests/phpunit/tests/image/editor_gd.php

@@ -7 +7 @@
  * @group wp-image-editor-gd
  */
+require_once( dirname( __FILE__ ) . '/base.php' );
 
 class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
@@ -14 +15 @@
         require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
         require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
+
         parent::setUp();
+    }
+
+    public function tearDown() {
+        $folder = DIR_TESTDATA . '/images/waffles-*.jpg';
+
+        foreach ( glob( $folder ) as $file ) {
+            unlink( $file );
+        }
+
+        $this->remove_added_uploads();
+
+        parent::tearDown();
     }
 
@@ -135 +149 @@
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
 
+        unlink( $save_to_file );
     }
     
@@ -154 +169 @@
 
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+
+        unlink( $save_to_file );
     }