Changeset 50087 for branches/4.8
- Timestamp:
- 01/30/2021 11:13:04 AM (4 years ago)
- Location:
- branches/4.8
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.8
- Property svn:mergeinfo changed
/trunk merged: 43511-43512,46682,46996
- Property svn:mergeinfo changed
-
branches/4.8/tests/phpunit/includes/testcase.php
r40875 r50087 178 178 179 179 /** 180 * Allow tests to be skipped on some automated runs 180 * Allow tests to be skipped on some automated runs. 181 181 * 182 182 * For test runs on Travis for something other than trunk/master … … 218 218 $this->markTestSkipped( 'Test does not run on Multisite' ); 219 219 } 220 } 221 222 /** 223 * Allow tests to be skipped if the HTTP request times out. 224 * 225 * @param array|WP_Error $response HTTP response. 226 */ 227 public function skipTestOnTimeout( $response ) { 228 if ( ! is_wp_error( $response ) ) { 229 return; 230 } 231 if ( 'connect() timed out!' === $response->get_error_message() ) { 232 $this->markTestSkipped( 'HTTP timeout' ); 233 } 234 235 if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) { 236 $this->markTestSkipped( 'HTTP timeout' ); 237 } 238 239 if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) { 240 $this->markTestSkipped( 'HTTP timeout' ); 241 } 242 220 243 } 221 244 -
branches/4.8/tests/phpunit/tests/external-http/basic.php
r40519 r50087 14 14 15 15 $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' ); 16 if ( 200 != wp_remote_retrieve_response_code( $response ) ) { 17 $this->fail( 'Could not contact PHP.net to check versions.' ); 16 17 $this->skipTestOnTimeout( $response ); 18 19 $response_code = wp_remote_retrieve_response_code( $response ); 20 if ( 200 !== $response_code ) { 21 $this->fail( sprintf( 'Could not contact PHP.net to check versions. Response code: %s', $response_code ) ); 18 22 } 23 19 24 $php = wp_remote_retrieve_body( $response ); 20 25 … … 26 31 27 32 $response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" ); 28 if ( 200 != wp_remote_retrieve_response_code( $response ) ) { 29 $this->fail( 'Could not contact dev.MySQL.com to check versions.' ); 33 34 $this->skipTestOnTimeout( $response ); 35 36 $response_code = wp_remote_retrieve_response_code( $response ); 37 if ( 200 !== $response_code ) { 38 $this->fail( sprintf( 'Could not contact dev.MySQL.com to check versions. Response code: %s', $response_code ) ); 30 39 } 40 31 41 $mysql = wp_remote_retrieve_body( $response ); 32 42 -
branches/4.8/tests/phpunit/tests/http/base.php
r40524 r50087 18 18 protected $http_request_args; 19 19 20 /**21 * Mark test as skipped if the HTTP request times out22 */23 function skipTestOnTimeout( $response ) {24 if( ! is_wp_error( $response ) ){25 return;26 }27 if ( 'connect() timed out!' === $response->get_error_message() ){28 $this->markTestSkipped( 'HTTP timeout' );29 }30 31 if ( 0 === strpos( $response->get_error_message(), 'Operation timed out after' ) ){32 $this->markTestSkipped( 'HTTP timeout' );33 }34 35 if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) {36 $this->markTestSkipped( 'HTTP timeout' );37 }38 39 }40 41 20 function setUp() { 42 21 … … 74 53 // 5 : 5 & 301 75 54 $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 5) ); 55 56 $this->skipTestOnTimeout( $res ); 76 57 $this->assertNotWPError( $res ); 77 58 $this->assertEquals(200, (int)$res['response']['code'] ); … … 81 62 // 5 : 5 & 302 82 63 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 5) ); 64 65 $this->skipTestOnTimeout( $res ); 83 66 $this->assertNotWPError( $res ); 84 67 $this->assertEquals(200, (int)$res['response']['code'] ); … … 91 74 // 5 > 0 & 301 92 75 $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 0) ); 76 77 $this->skipTestOnTimeout( $res ); 93 78 $this->assertNotWPError( $res ); 94 79 $this->assertEquals(301, (int)$res['response']['code'] ); … … 101 86 // 5 > 0 & 302 102 87 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) ); 88 89 $this->skipTestOnTimeout( $res ); 103 90 $this->assertNotWPError( $res ); 104 91 $this->assertEquals(302, (int)$res['response']['code'] ); … … 108 95 // 5 - 5 109 96 $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5) ); 97 98 $this->skipTestOnTimeout( $res ); 110 99 $this->assertNotWPError( $res ); 111 100 $this->assertEquals(200, (int)$res['response']['code'] ); … … 115 104 // No redirections on HEAD request: 116 105 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 1, array('method' => 'HEAD') ); 106 107 $this->skipTestOnTimeout( $res ); 117 108 $this->assertNotWPError( $res ); 118 109 $this->assertEquals( 302, (int)$res['response']['code'] ); … … 125 116 // Redirections on HEAD request when Requested 126 117 $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5, 'method' => 'HEAD') ); 118 119 $this->skipTestOnTimeout( $res ); 127 120 $this->assertNotWPError( $res ); 128 121 $this->assertEquals( 200, (int)$res['response']['code'] ); … … 132 125 // 10 > 5 133 126 $res = wp_remote_request($this->redirection_script . '?rt=' . 10, array('redirection' => 5) ); 127 128 $this->skipTestOnTimeout( $res ); 134 129 $this->assertWPError( $res ); 135 130 } … … 138 133 // 6 > 5 (close edgecase) 139 134 $res = wp_remote_request($this->redirection_script . '?rt=' . 6, array('redirection' => 5) ); 135 136 $this->skipTestOnTimeout( $res ); 140 137 $this->assertWPError( $res ); 141 138 } … … 144 141 // 4 < 5 (close edgecase) 145 142 $res = wp_remote_request($this->redirection_script . '?rt=' . 4, array('redirection' => 5) ); 143 144 $this->skipTestOnTimeout( $res ); 146 145 $this->assertNotWPError( $res ); 147 146 } … … 153 152 // 0 redirections asked for, Should return the document? 154 153 $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) ); 154 155 $this->skipTestOnTimeout( $res ); 155 156 $this->assertNotWPError( $res ); 156 157 $this->assertEquals( 302, (int)$res['response']['code'] ); … … 165 166 // Prints PASS on initial load, FAIL if the client follows the specified redirection 166 167 $res = wp_remote_request( $this->redirection_script . '?201-location=true' ); 168 169 $this->skipTestOnTimeout( $res ); 167 170 $this->assertNotWPError( $res ); 168 171 $this->assertEquals( 'PASS', $res['body']); … … 179 182 // Test 301 - POST to POST 180 183 $res = wp_remote_request( $url, array( 'method' => 'PUT', 'timeout' => 30 ) ); 184 185 $this->skipTestOnTimeout( $res ); 181 186 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) ); 182 187 $this->assertTrue( !empty( $res['headers']['location'] ) ); … … 191 196 $res = wp_remote_request( $this->redirection_script . '?header-check', array('headers' => $headers) ); 192 197 198 $this->skipTestOnTimeout( $res ); 193 199 $this->assertNotWPError( $res ); 194 200 … … 221 227 222 228 $this->skipTestOnTimeout( $res ); 223 224 229 $this->assertNotWPError( $res ); 225 230 $this->assertEquals( '', $res['body'] ); // The body should be empty. … … 244 249 245 250 $this->skipTestOnTimeout( $res ); 246 247 251 $this->assertNotWPError( $res ); 248 252 $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters … … 262 266 263 267 $this->skipTestOnTimeout( $res ); 264 265 268 $this->assertNotWPError( $res ); 266 269 $this->assertEquals( $size, strlen( $res['body'] ) ); … … 278 281 279 282 $res = wp_remote_post( add_query_arg( 'response_code', $response_code, $url ), array( 'timeout' => 30 ) ); 283 284 $this->skipTestOnTimeout( $res ); 280 285 $this->assertEquals( $method, wp_remote_retrieve_body( $res ) ); 281 286 } … … 323 328 324 329 $res = wp_remote_get( $url, $args ); 330 331 $this->skipTestOnTimeout( $res ); 325 332 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) ); 326 333 … … 344 351 remove_filter( 'http_request_args', array( $this, 'filter_http_request_args' ) ); 345 352 353 $this->skipTestOnTimeout( $res ); 346 354 $this->assertNotEmpty( $this->http_request_args['sslcertificates'] ); 347 355 $this->assertNotWPError( $res ); … … 357 365 $res = wp_remote_head( $url, array( 'timeout' => 30 ) ); 358 366 367 $this->skipTestOnTimeout( $res ); 359 368 $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) ); 360 369 $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) ); 361 370 362 371 $res = wp_remote_get( $url, array( 'timeout' => 30 ) ); 372 373 $this->skipTestOnTimeout( $res ); 363 374 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) ); 364 375 … … 374 385 375 386 $res = wp_remote_get( $url ); 387 388 $this->skipTestOnTimeout( $res ); 376 389 $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) ); 377 390 } … … 388 401 389 402 $res = wp_remote_get( 'https://wordpress.org/' ); 403 404 $this->skipTestOnTimeout( $res ); 390 405 $this->assertNotWPError( $res ); 391 406 } … … 401 416 402 417 $res = wp_remote_request( $url ); 418 419 $this->skipTestOnTimeout( $res ); 403 420 $this->assertNotWPError( $res ); 404 421 } -
branches/4.8/tests/phpunit/tests/http/functions.php
r38761 r50087 6 6 */ 7 7 class Tests_HTTP_Functions extends WP_UnitTestCase { 8 8 9 public function setUp() { 9 10 if ( ! extension_loaded( 'openssl' ) ) { … … 18 19 $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg'; 19 20 $response = wp_remote_head( $url ); 21 22 $this->skipTestOnTimeout( $response ); 23 20 24 $headers = wp_remote_retrieve_headers( $response ); 21 25 … … 31 35 $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg'; 32 36 $response = wp_remote_head( $url ); 37 38 $this->skipTestOnTimeout( $response ); 33 39 $this->assertEquals( '301', wp_remote_retrieve_response_code( $response ) ); 34 40 } … … 36 42 function test_head_404() { 37 43 $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg'; 38 $ headers= wp_remote_head( $url );44 $response = wp_remote_head( $url ); 39 45 40 $this->assertEquals( '404', wp_remote_retrieve_response_code( $headers ) ); 46 $this->skipTestOnTimeout( $response ); 47 $this->assertEquals( '404', wp_remote_retrieve_response_code( $response ) ); 41 48 } 42 49 … … 45 52 46 53 $response = wp_remote_get( $url ); 54 55 $this->skipTestOnTimeout( $response ); 56 47 57 $headers = wp_remote_retrieve_headers( $response ); 48 58 … … 60 70 61 71 $response = wp_remote_get( $url ); 72 73 $this->skipTestOnTimeout( $response ); 74 62 75 $headers = wp_remote_retrieve_headers( $response ); 63 76 … … 74 87 // pretend we've already redirected 5 times 75 88 $response = wp_remote_get( $url, array( 'redirection' => -1 ) ); 89 90 $this->skipTestOnTimeout( $response ); 76 91 $this->assertWPError( $response ); 77 92 } … … 84 99 85 100 $response = wp_remote_head( $url ); 86 $cookies = wp_remote_retrieve_cookies( $response ); 101 102 $this->skipTestOnTimeout( $response ); 103 104 $cookies = wp_remote_retrieve_cookies( $response ); 87 105 88 106 $this->assertNotEmpty( $cookies ); … … 114 132 ), 115 133 ) ); 116 $cookies = wp_remote_retrieve_cookies( $response ); 134 135 $this->skipTestOnTimeout( $response ); 136 137 $cookies = wp_remote_retrieve_cookies( $response ); 117 138 118 139 $this->assertNotEmpty( $cookies ); … … 135 156 ), 136 157 ) ); 137 $cookies = wp_remote_retrieve_cookies( $response ); 158 159 $this->skipTestOnTimeout( $response ); 160 161 $cookies = wp_remote_retrieve_cookies( $response ); 138 162 139 163 $this->assertNotEmpty( $cookies );
Note: See TracChangeset
for help on using the changeset viewer.