WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
01/30/2021 09:01:52 PM (5 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 [38757], [43511], [43512], [46682], [46996] to the 4.1 branch.
See #51669.

Location:
branches/4.1
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/4.1

  • branches/4.1/tests/phpunit/tests/http/base.php

    r29968 r50103  
    4545        // 5 : 5 & 301
    4646        $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 5) );
     47
     48        $this->skipTestOnTimeout( $res );
    4749        $this->assertFalse( is_wp_error($res) );
    4850        $this->assertEquals(200, (int)$res['response']['code'] );
    … …  
    5254        // 5 : 5 & 302
    5355        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 5) );
     56
     57        $this->skipTestOnTimeout( $res );
    5458        $this->assertFalse( is_wp_error($res) );
    5559        $this->assertEquals(200, (int)$res['response']['code'] );
    … …  
    6266        // 5 > 0 & 301
    6367        $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 0) );
     68
     69        $this->skipTestOnTimeout( $res );
    6470        $this->assertFalse( is_wp_error($res) );
    6571        $this->assertEquals(301, (int)$res['response']['code'] );
    … …  
    7278        // 5 > 0 & 302
    7379        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
     80
     81        $this->skipTestOnTimeout( $res );
    7482        $this->assertFalse( is_wp_error($res) );
    7583        $this->assertEquals(302, (int)$res['response']['code'] );
    … …  
    7987        // 5 - 5
    8088        $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5) );
     89
     90        $this->skipTestOnTimeout( $res );
    8191        $this->assertFalse( is_wp_error($res) );
    8292        $this->assertEquals(200, (int)$res['response']['code'] );
    … …  
    8696        // No redirections on HEAD request:
    8797        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 1, array('method' => 'HEAD') );
     98
     99        $this->skipTestOnTimeout( $res );
    88100        $this->assertFalse( is_wp_error($res) );
    89101        $this->assertEquals( 302, (int)$res['response']['code'] );
    … …  
    96108        // Redirections on HEAD request when Requested
    97109        $res = wp_remote_request($this->redirection_script . '?rt=' . 5, array('redirection' => 5, 'method' => 'HEAD') );
     110
     111        $this->skipTestOnTimeout( $res );
    98112        $this->assertFalse( is_wp_error($res) );
    99113        $this->assertEquals( 200, (int)$res['response']['code'] );
    … …  
    103117        // 10 > 5
    104118        $res = wp_remote_request($this->redirection_script . '?rt=' . 10, array('redirection' => 5) );
     119
     120        $this->skipTestOnTimeout( $res );
    105121        $this->assertTrue( is_wp_error($res), print_r($res, true) );
    106122    }
    … …  
    109125        // 6 > 5 (close edgecase)
    110126        $res = wp_remote_request($this->redirection_script . '?rt=' . 6, array('redirection' => 5) );
     127
     128        $this->skipTestOnTimeout( $res );
    111129        $this->assertTrue( is_wp_error($res) );
    112130    }
    … …  
    115133        // 4 < 5 (close edgecase)
    116134        $res = wp_remote_request($this->redirection_script . '?rt=' . 4, array('redirection' => 5) );
     135
     136        $this->skipTestOnTimeout( $res );
    117137        $this->assertFalse( is_wp_error($res) );
    118138    }
    … …  
    124144        // 0 redirections asked for, Should return the document?
    125145        $res = wp_remote_request($this->redirection_script . '?code=302&rt=' . 5, array('redirection' => 0) );
     146
     147        $this->skipTestOnTimeout( $res );
    126148        $this->assertFalse( is_wp_error($res) );
    127149        $this->assertEquals( 302, (int)$res['response']['code'] );
    … …  
    136158        // Prints PASS on initial load, FAIL if the client follows the specified redirection
    137159        $res = wp_remote_request( $this->redirection_script . '?201-location=true' );
     160
     161        $this->skipTestOnTimeout( $res );
    138162        $this->assertFalse( is_wp_error( $res ) );
    139163        $this->assertEquals( 'PASS', $res['body']);
    … …  
    150174        // Test 301 - POST to POST
    151175        $res = wp_remote_request( $url, array( 'method' => 'PUT', 'timeout' => 30 ) );
     176
     177        $this->skipTestOnTimeout( $res );
    152178        $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
    153179        $this->assertTrue( !empty( $res['headers']['location'] ) );
    … …  
    162188        $res = wp_remote_request( $this->redirection_script . '?header-check', array('headers' => $headers) );
    163189
     190        $this->skipTestOnTimeout( $res );
    164191        $this->assertFalse( is_wp_error($res) );
    165192
    … …  
    189216            $filesize = filesize( $res['filename'] );
    190217            unlink( $res['filename'] );
    191         }       
    192 
     218        }
     219
     220        $this->skipTestOnTimeout( $res );
    193221        $this->assertFalse( is_wp_error( $res ) );
    194222        $this->assertEquals( '', $res['body'] ); // The body should be empty.
    … …  
    211239        }
    212240
     241        $this->skipTestOnTimeout( $res );
    213242        $this->assertFalse( is_wp_error( $res ) );
    214243        $this->assertEquals( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters
    … …  
    219248     * Test POST redirection methods
    220249     *
     250     * @dataProvider data_post_redirect_to_method_300
     251     *
    221252     * @ticket 17588
    222253     */
    223     function test_post_redirect_to_method_300() {
     254    function test_post_redirect_to_method_300( $response_code, $method ) {
    224255        $url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?post-redirect-to-method=1';
    225256
    226         // Test 300 - POST to POST
    227         $res = wp_remote_post( add_query_arg( 'response_code', 300, $url ), array( 'timeout' => 30 ) );
    228         $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
    229 
    230         // Test 301 - POST to POST
    231         $res = wp_remote_post( add_query_arg( 'response_code', 301, $url ), array( 'timeout' => 30 ) );
    232         $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
    233 
    234         // Test 302 - POST to GET
    235         $res = wp_remote_post( add_query_arg( 'response_code', 302, $url ), array( 'timeout' => 30 ) );
    236         $this->assertEquals( 'GET', wp_remote_retrieve_body( $res ) );
    237 
    238         // Test 303 - POST to GET
    239         $res = wp_remote_post( add_query_arg( 'response_code', 303, $url ), array( 'timeout' => 30 ) );
    240         $this->assertEquals( 'GET', wp_remote_retrieve_body( $res ) );
    241 
    242         // Test 304 - POST to POST
    243         $res = wp_remote_post( add_query_arg( 'response_code', 304, $url ), array( 'timeout' => 30 ) );
    244         $this->assertEquals( 'POST', wp_remote_retrieve_body( $res ) );
     257        $res = wp_remote_post( add_query_arg( 'response_code', $response_code, $url ), array( 'timeout' => 30 ) );
     258
     259        $this->skipTestOnTimeout( $res );
     260        $this->assertEquals( $method, wp_remote_retrieve_body( $res ) );
     261    }
     262
     263    public function data_post_redirect_to_method_300() {
     264        return array(
     265            // Test 300 - POST to POST
     266            array(
     267                300,
     268                'POST',
     269            ),
     270            // Test 301 - POST to POST
     271            array(
     272                301,
     273                'POST',
     274            ),
     275            // Test 302 - POST to GET
     276            array(
     277                302,
     278                'GET',
     279            ),
     280            // Test 303 - POST to GET
     281            array(
     282                303,
     283                'GET',
     284            ),
     285            // Test 304 - POST to POST
     286            array(
     287                304,
     288                'POST',
     289            ),
     290        );
    245291    }
    246292
    … …  
    262308
    263309        $res = wp_remote_get( $url, $args );
     310
     311        $this->skipTestOnTimeout( $res );
    264312        $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
    265313
    … …  
    275323        $res = wp_remote_head( $url, array( 'timeout' => 30 ) );
    276324
     325        $this->skipTestOnTimeout( $res );
    277326        $this->assertInternalType( 'array', wp_remote_retrieve_header( $res, 'location' ) );
    278327        $this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
    279328
    280329        $res = wp_remote_get( $url, array( 'timeout' => 30 ) );
     330
     331        $this->skipTestOnTimeout( $res );
    281332        $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
    282333
    … …  
    292343
    293344        $res = wp_remote_get( $url );
     345
     346        $this->skipTestOnTimeout( $res );
    294347        $this->assertEquals( 'PASS', wp_remote_retrieve_body( $res ) );
    295348    }
    … …  
    306359
    307360        $res = wp_remote_get( 'https://wordpress.org/' );
     361
     362        $this->skipTestOnTimeout( $res );
    308363        $this->assertTrue( ! is_wp_error( $res ), print_r( $res, true ) );
    309364    }
Note: See TracChangeset for help on using the changeset viewer.