WordPress.org

Make WordPress Core


Ignore:
Timestamp:
01/30/2021 11:45:38 AM (9 months ago)
Author:
SergeyBiryukov
Message:

Tests: Use skipTestOnTimeout() in more HTTP tests.

Adjust it to handle more types of timeouts, e.g. "Resolving timed out", "Connection timed out".

Merges [38757], [43511], [43512], [46682], [46996] to the 4.6 branch.
See #51669.

Location:
branches/4.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.6

  • branches/4.6/tests/phpunit/tests/external-http/basic.php

    r42101 r50089  
    1010
    1111        $readme = file_get_contents( ABSPATH . 'readme.html' );
     12
    1213        preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches );
    1314
    1415        $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' );
    15         if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
    16             $this->markTestSkipped( 'Could not contact PHP.net to check versions.' );
     16
     17        $this->skipTestOnTimeout( $response );
     18
     19        $response_code = wp_remote_retrieve_response_code( $response );
     20        if ( 200 !== $response_code ) {
     21            $this->fail( sprintf( 'Could not contact PHP.net to check versions. Response code: %s', $response_code ) );
    1722        }
     23
    1824        $php = wp_remote_retrieve_body( $response );
    1925
     
    2531
    2632        $response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" );
    27         if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
    28             $this->markTestSkipped( 'Could not contact dev.MySQL.com to check versions.' );
     33
     34        $this->skipTestOnTimeout( $response );
     35
     36        $response_code = wp_remote_retrieve_response_code( $response );
     37        if ( 200 !== $response_code ) {
     38            $this->fail( sprintf( 'Could not contact dev.MySQL.com to check versions. Response code: %s', $response_code ) );
    2939        }
     40
    3041        $mysql = wp_remote_retrieve_body( $response );
    3142
Note: See TracChangeset for help on using the changeset viewer.