Changeset 43626

Timestamp:

09/03/2018 09:55:42 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Tests: Introduce Tests_HTTP_Functions::skipTestOnTimeout(), mirroring the same WP_HTTP_UnitTestCase method.

Merges [43512] to the 4.9 branch.
Fixes #44613.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/http/base.php (modified) (1 diff)
• tests/phpunit/tests/http/functions.php (modified) (9 diffs)

branches/4.9/tests/phpunit/tests/http/base.php

@@ -19 +19 @@
 
         /**
-         * Mark test as skipped if the HTTP request times out
+         * Mark test as skipped if the HTTP request times out.
          */
         function skipTestOnTimeout( $response ) {

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

@@ -6 +6 @@
  */
 class Tests_HTTP_Functions extends WP_UnitTestCase {
+
+        /**
+         * Mark test as skipped if the HTTP request times out.
+         */
+        function skipTestOnTimeout( $response ) {
+                if ( ! is_wp_error( $response ) ) {
+                        return;
+                }
+                if ( 'connect() timed out!' === $response->get_error_message() ) {
+                        $this->markTestSkipped( 'HTTP timeout' );
+                }
+
+                if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) {
+                        $this->markTestSkipped( 'HTTP timeout' );
+                }
+
+                if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) {
+                        $this->markTestSkipped( 'HTTP timeout' );
+                }
+
+        }
+
         public function setUp() {
                 if ( ! extension_loaded( 'openssl' ) ) {
@@ -18 +40 @@
                 $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 +56 @@
                 $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 ) );
         }
 
         function test_head_404() {
-                $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
-                $headers = wp_remote_head( $url );
+                $url      = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
+                $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 +73 @@
 
                 $response = wp_remote_get( $url );
+
+                $this->skipTestOnTimeout( $response );
+
                 $headers = wp_remote_retrieve_headers( $response );
 
@@ -60 +91 @@
 
                 $response = wp_remote_get( $url );
+
+                $this->skipTestOnTimeout( $response );
+
                 $headers = wp_remote_retrieve_headers( $response );
 
@@ -74 +108 @@
                 // pretend we've already redirected 5 times
                 $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
+
+                $this->skipTestOnTimeout( $response );
                 $this->assertWPError( $response );
         }
@@ -84 +120 @@
 
                 $response = wp_remote_head( $url );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );
@@ -114 +153 @@
                         ),
                 ) );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );
@@ -135 +177 @@
                         ),
                 ) );
-                $cookies  = wp_remote_retrieve_cookies( $response );
+
+                $this->skipTestOnTimeout( $response );
+
+                $cookies = wp_remote_retrieve_cookies( $response );
 
                 $this->assertNotEmpty( $cookies );