Changeset 43695 for branches/5.0

Timestamp:

10/11/2018 03:17:44 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use WP_HTTP_UnitTestCase::skipTestOnTimeout() in more HTTP tests.

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

Merges [43511] to the 5.0 branch.
See #44613.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/http/base.php (modified) (25 diffs)

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

@@ -29 +29 @@
                 }
 
-                if ( 0 === strpos( $response->get_error_message(), 'Operation timed out after' ) ){
+                if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) {
                         $this->markTestSkipped( 'HTTP timeout' );
                 }
@@ -74 +74 @@
                 // 5 : 5 & 301
                 $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals(200, (int)$res['response']['code'] );
@@ -81 +83 @@
                 // 5 : 5 & 302
                 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals(200, (int)$res['response']['code'] );
@@ -91 +95 @@
                 // 5 > 0 & 301
                 $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 0) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals(301, (int)$res['response']['code'] );
@@ -101 +107 @@
                 // 5 > 0 & 302
                 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals(302, (int)$res['response']['code'] );
@@ -108 +116 @@
                 // 5 - 5
                 $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals(200, (int)$res['response']['code'] );
@@ -115 +125 @@
                 // No redirections on HEAD request:
                 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 1, array('method' => 'HEAD') );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals( 302, (int)$res['response']['code'] );
@@ -125 +137 @@
                 // Redirections on HEAD request when Requested
                 $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5, 'method' => 'HEAD') );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals( 200, (int)$res['response']['code'] );
@@ -132 +146 @@
                 // 10 > 5
                 $res = wp_remote_request($this->redirection_script . '?rt=' . 10, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertWPError( $res );
         }
@@ -138 +154 @@
                 // 6 > 5 (close edgecase)
                 $res = wp_remote_request($this->redirection_script . '?rt=' . 6, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertWPError( $res );
         }
@@ -144 +162 @@
                 // 4 < 5 (close edgecase)
                 $res = wp_remote_request($this->redirection_script . '?rt=' . 4, array('redirection' => 5) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
         }
@@ -153 +173 @@
                 // 0 redirections asked for, Should return the document?
                 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals( 302, (int)$res['response']['code'] );
@@ -165 +187 @@
                 // Prints PASS on initial load, FAIL if the client follows the specified redirection
                 $res = wp_remote_request( $this->redirection_script . '?201-location=true' );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
                 $this->assertEquals( 'PASS', $res['body']);
@@ -179 +203 @@
                 // Test 301 - POST to POST
                 $res = wp_remote_request( $url, array( 'method' => 'PUT', 'timeout' => 30 ) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
                 $this->assertTrue( !empty( $res['headers']['location'] ) );
@@ -191 +217 @@
                 $res = wp_remote_request( $this->redirection_script . '?header-check', array('headers' => $headers) );
 
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
 
@@ -221 +248 @@
 
                 $this->skipTestOnTimeout( $res );
-
                 $this->assertNotWPError( $res );
                 $this->assertEquals( '', $res['body'] ); // The body should be empty.
@@ -244 +270 @@
 
                 $this->skipTestOnTimeout( $res );
-
                 $this->assertNotWPError( $res );
                 $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters
@@ -262 +287 @@
 
                 $this->skipTestOnTimeout( $res );
-
                 $this->assertNotWPError( $res );
                 $this->assertEquals( $size, strlen( $res['body'] ) );
@@ -278 +302 @@
 
                 $res = wp_remote_post( add_query_arg( 'response_code', $response_code, $url ), array( 'timeout' => 30 ) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertEquals( $method, wp_remote_retrieve_body( $res ) );
         }
@@ -323 +349 @@
 
                 $res = wp_remote_get( $url, $args );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
 
@@ -344 +372 @@
                 remove_filter( 'http_request_args', array( $this, 'filter_http_request_args' ) );
 
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotEmpty( $this->http_request_args['sslcertificates'] );
                 $this->assertNotWPError( $res );
@@ -357 +386 @@
                 $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
 
+                $this->skipTestOnTimeout( $res );
                 $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
                 $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
 
                 $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
 
@@ -374 +406 @@
 
                 $res = wp_remote_get( $url );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
         }
@@ -388 +422 @@
 
                 $res = wp_remote_get( 'https://wordpress.org/' );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
         }
@@ -401 +437 @@
 
                 $res = wp_remote_request( $url );
+
+                $this->skipTestOnTimeout( $res );
                 $this->assertNotWPError( $res );
         }