Make WordPress Core


Ignore:
Timestamp:
02/21/2020 01:05:39 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.8

  • branches/3.8/tests/phpunit/tests/image/functions.php

    r26705 r47338  
    8989        $files = array(
    9090            // 'test-image-cmyk.jpg', Allowed in r9727
    91             'test-image.bmp',
     91            // 'test-image.bmp', Allowed in r28589
    9292            // 'test-image-grayscale.jpg', Allowed in r9727
    9393            'test-image.pct',
     
    145145
    146146                // Clean up
    147                 @unlink( $file );
    148                 @unlink( $ret['path'] );
     147                unlink( $file );
     148                unlink( $ret['path'] );
    149149            }
    150150
     
    186186
    187187            // Clean up
    188             @unlink( $file );
    189             @unlink( $ret['path'] );
     188            unlink( $file );
     189            unlink( $ret['path'] );
    190190            unset( $img );
    191191        }
     
    232232                $this->assertNotInstanceOf( 'WP_Error', $ret );
    233233                $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
    234                 @unlink( $file );
    235                 @unlink( $ret['path'] );
     234                unlink( $ret['path'] );
    236235            }
    237236
     
    292291            $this->markTestSkipped( 'jpeg support unavailable' );
    293292
    294         $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
     293        if ( ! extension_loaded( 'openssl' ) ) {
     294            $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() requires openssl.' );
     295        }
     296
     297        $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
    295298                              0, 0, 100, 100, 100, 100, false,
    296299                              DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
     
    312315
    313316    public function test_wp_crop_image_url_not_exist() {
    314         $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
     317        if ( ! extension_loaded( 'openssl' ) ) {
     318            $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url_not_exist() requires openssl.' );
     319        }
     320
     321        $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
    315322                              0, 0, 100, 100, 100, 100 );
    316323        $this->assertInstanceOf( 'WP_Error', $file );
Note: See TracChangeset for help on using the changeset viewer.