Changeset 50088 for branches/4.7/tests/phpunit/tests/http/functions.php

Timestamp:

01/30/2021 11:29:34 AM (6 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 [43511], [43512], [46682], [46996] to the 4.7 branch.
See #51669.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/http/functions.php (modified) (10 diffs)

branches/4.7/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 );
 
@@ -31 +35 @@
                 $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 ) );
         }
@@ -36 +42 @@
         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 ) );
         }
 
@@ -45 +52 @@
 
                 $response = wp_remote_get( $url );
+
+                $this->skipTestOnTimeout( $response );
+
                 $headers = wp_remote_retrieve_headers( $response );
 
@@ -60 +70 @@
 
                 $response = wp_remote_get( $url );
+
+                $this->skipTestOnTimeout( $response );
+
                 $headers = wp_remote_retrieve_headers( $response );
 
@@ -74 +87 @@
                 // pretend we've already redirected 5 times
                 $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
+
+                $this->skipTestOnTimeout( $response );
                 $this->assertWPError( $response );
         }
@@ -84 +99 @@
 
                 $response = wp_remote_head( $url );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );
@@ -114 +132 @@
                         ),
                 ) );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );
@@ -135 +156 @@
                         ),
                 ) );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );