Changeset 50089 for branches/4.6/tests/phpunit/tests/external-http/basic.php

Timestamp:

01/30/2021 11:45:38 AM (4 years 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:

• . (modified) (1 prop)
• tests/phpunit/tests/external-http/basic.php (modified) (2 diffs)

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

@@ -10 +10 @@
 
         $readme = file_get_contents( ABSPATH . 'readme.html' );
+
         preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches );
 
         $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' );
-        if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-            $this->markTestSkipped( 'Could not contact PHP.net to check versions.' );
+
+        $this->skipTestOnTimeout( $response );
+
+        $response_code = wp_remote_retrieve_response_code( $response );
+        if ( 200 !== $response_code ) {
+            $this->fail( sprintf( 'Could not contact PHP.net to check versions. Response code: %s', $response_code ) );
         }
+
         $php = wp_remote_retrieve_body( $response );
 
@@ -25 +31 @@
 
         $response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" );
-        if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-            $this->markTestSkipped( 'Could not contact dev.MySQL.com to check versions.' );
+
+        $this->skipTestOnTimeout( $response );
+
+        $response_code = wp_remote_retrieve_response_code( $response );
+        if ( 200 !== $response_code ) {
+            $this->fail( sprintf( 'Could not contact dev.MySQL.com to check versions. Response code: %s', $response_code ) );
         }
+
         $mysql = wp_remote_retrieve_body( $response );