Changeset 43511 for trunk/tests/phpunit/tests/http/base.php

Timestamp:

07/19/2018 07:09:56 PM (6 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".

See #44613.

File:

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

trunk/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' );
         }
@@ -75 +75 @@
         // 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'] );
@@ -82 +84 @@
         // 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'] );
@@ -92 +96 @@
         // 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'] );
@@ -102 +108 @@
         // 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'] );
@@ -109 +117 @@
         // 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'] );
@@ -116 +126 @@
         // 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'] );
@@ -131 +143 @@
             )
         );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertNotWPError( $res );
         $this->assertEquals( 200, (int) $res['response']['code'] );
@@ -138 +152 @@
         // 10 > 5
         $res = wp_remote_request( $this->redirection_script . '?rt=' . 10, array( 'redirection' => 5 ) );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertWPError( $res );
     }
@@ -144 +160 @@
         // 6 > 5 (close edgecase)
         $res = wp_remote_request( $this->redirection_script . '?rt=' . 6, array( 'redirection' => 5 ) );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertWPError( $res );
     }
@@ -150 +168 @@
         // 4 < 5 (close edgecase)
         $res = wp_remote_request( $this->redirection_script . '?rt=' . 4, array( 'redirection' => 5 ) );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertNotWPError( $res );
     }
@@ -159 +179 @@
         // 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'] );
@@ -171 +193 @@
         // 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'] );
@@ -190 +214 @@
             )
         );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
         $this->assertTrue( ! empty( $res['headers']['location'] ) );
@@ -206 +232 @@
         $res     = wp_remote_request( $this->redirection_script . '?header-check', array( 'headers' => $headers ) );
 
+        $this->skipTestOnTimeout( $res );
         $this->assertNotWPError( $res );
 
@@ -242 +269 @@
 
         $this->skipTestOnTimeout( $res );
-
         $this->assertNotWPError( $res );
         $this->assertEquals( '', $res['body'] ); // The body should be empty.
@@ -271 +297 @@
 
         $this->skipTestOnTimeout( $res );
-
         $this->assertNotWPError( $res );
         $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters
@@ -294 +319 @@
 
         $this->skipTestOnTimeout( $res );
-
         $this->assertNotWPError( $res );
         $this->assertEquals( $size, strlen( $res['body'] ) );
@@ -310 +334 @@
 
         $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 ) );
     }
@@ -355 +381 @@
 
         $res = wp_remote_get( $url, $args );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
 
@@ -376 +404 @@
         remove_filter( 'http_request_args', array( $this, 'filter_http_request_args' ) );
 
+        $this->skipTestOnTimeout( $res );
         $this->assertNotEmpty( $this->http_request_args['sslcertificates'] );
         $this->assertNotWPError( $res );
@@ -389 +418 @@
         $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 ) );
 
@@ -406 +438 @@
 
         $res = wp_remote_get( $url );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
     }
@@ -421 +455 @@
 
         $res = wp_remote_get( 'https://wordpress.org/' );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertNotWPError( $res );
     }
@@ -434 +470 @@
 
         $res = wp_remote_request( $url );
+
+        $this->skipTestOnTimeout( $res );
         $this->assertNotWPError( $res );
     }