Changeset 50089 for branches/4.6/tests/phpunit/tests/http/functions.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/http/functions.php (modified) (10 diffs)

branches/4.6/tests/phpunit/tests/http/functions.php

@@ -6 +6 @@
  */
 class Tests_HTTP_Functions extends WP_UnitTestCase {
+
     public function setUp() {
         if ( ! extension_loaded( 'openssl' ) ) {
@@ -18 +19 @@
         $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
         $response = wp_remote_head( $url );
+
+        $this->skipTestOnTimeout( $response );
+
         $headers = wp_remote_retrieve_headers( $response );
 
@@ -38 +42 @@
         $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
         $response = wp_remote_head( $url );
+
+        $this->skipTestOnTimeout( $response );
         $this->assertEquals( '301', wp_remote_retrieve_response_code( $response ) );
     }
@@ -43 +49 @@
     function test_head_404() {
         $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
-        $headers = wp_remote_head( $url );
+        $response = wp_remote_head( $url );
 
-        $this->assertEquals( '404', wp_remote_retrieve_response_code( $headers ) );
+        $this->skipTestOnTimeout( $response );
+        $this->assertEquals( '404', wp_remote_retrieve_response_code( $response ) );
     }
 
@@ -52 +59 @@
 
         $response = wp_remote_get( $url );
+
+        $this->skipTestOnTimeout( $response );
+
         $headers = wp_remote_retrieve_headers( $response );
 
@@ -65 +75 @@
 
         $response = wp_remote_get( $url );
+
+        $this->skipTestOnTimeout( $response );
+
         $headers = wp_remote_retrieve_headers( $response );
 
@@ -79 +92 @@
         // pretend we've already redirected 5 times
         $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
+
+        $this->skipTestOnTimeout( $response );
         $this->assertWPError( $response );
     }
@@ -89 +104 @@
 
         $response = wp_remote_head( $url );
-        $cookies  = wp_remote_retrieve_cookies( $response );
+
+        $this->skipTestOnTimeout( $response );
+
+        $cookies = wp_remote_retrieve_cookies( $response );
 
         $this->assertNotEmpty( $cookies );
@@ -119 +137 @@
             ),
         ) );
-        $cookies  = wp_remote_retrieve_cookies( $response );
+
+        $this->skipTestOnTimeout( $response );
+
+        $cookies = wp_remote_retrieve_cookies( $response );
 
         $this->assertNotEmpty( $cookies );
@@ -140 +161 @@
             ),
         ) );
-        $cookies  = wp_remote_retrieve_cookies( $response );
+
+        $this->skipTestOnTimeout( $response );
+
+        $cookies = wp_remote_retrieve_cookies( $response );
 
         $this->assertNotEmpty( $cookies );