Changeset 50101 for branches/4.3/tests/phpunit/tests/http/functions.php

Timestamp:

01/30/2021 08:45:47 PM (4 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.3 branch.
See #51669.

Location:

branches/4.3

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/http/functions.php (modified) (7 diffs)

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

@@ -18 +18 @@
         $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 );
 
@@ -30 +33 @@
         $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 ) );
     }
@@ -35 +40 @@
     function test_head_404() {
         $url = 'https://asdftestblog1.files.wordpress.com/2007/09/awefasdfawef.jpg';
-        $headers = wp_remote_head( $url );
+        $response = wp_remote_head( $url );
 
-        $this->assertInternalType( 'array', $headers, "Reply wasn't array." );
-        $this->assertEquals( '404', wp_remote_retrieve_response_code( $headers ) );
+        $this->skipTestOnTimeout( $response );
+        $this->assertInternalType( 'array', $response, "Reply wasn't array." );
+        $this->assertEquals( '404', wp_remote_retrieve_response_code( $response ) );
     }
 
     function test_get_request() {
         $url = 'https://asdftestblog1.files.wordpress.com/2007/09/2007-06-30-dsc_4700-1.jpg';
-        $file = tempnam('/tmp', 'testfile');
 
-        $headers = wp_get_http($url, $file);
+        $response = wp_remote_get( $url );
+
+        $this->skipTestOnTimeout( $response );
+
+        $headers = wp_remote_retrieve_headers( $response );
 
         // should return the same headers as a head request
@@ -51 +60 @@
         $this->assertEquals( 'image/jpeg', $headers['content-type'] );
         $this->assertEquals( '40148', $headers['content-length'] );
-        $this->assertEquals( '200', $headers['response'] );
-
-        // make sure the file is ok
-        $this->assertEquals( 40148, filesize($file) );
-        $this->assertEquals( 'b0371a0fc575fcf77f62cd298571f53b', md5_file($file) );
+        $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );
     }
 
@@ -61 +66 @@
         // this will redirect to asdftestblog1.files.wordpress.com
         $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
-        $file = tempnam('/tmp', 'testfile');
 
-        $headers = wp_get_http($url, $file);
+        $response = wp_remote_get( $url );
+
+        $this->skipTestOnTimeout( $response );
+
+        $headers = wp_remote_retrieve_headers( $response );
 
         // should return the same headers as a head request
@@ -69 +77 @@
         $this->assertEquals( 'image/jpeg', $headers['content-type'] );
         $this->assertEquals( '40148', $headers['content-length'] );
-        $this->assertEquals( '200', $headers['response'] );
-
-        // make sure the file is ok
-        $this->assertEquals( 40148, filesize($file) );
-        $this->assertEquals( 'b0371a0fc575fcf77f62cd298571f53b', md5_file($file) );
+        $this->assertEquals( '200', wp_remote_retrieve_response_code( $response ) );
     }
 
@@ -79 +83 @@
         // this will redirect to asdftestblog1.files.wordpress.com
         $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
-        $file = tempnam('/tmp', 'testfile');
+
         // pretend we've already redirected 5 times
-        $headers = wp_get_http( $url, $file, 6 );
-        $this->assertFalse( $headers );
+        $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
+
+        $this->skipTestOnTimeout( $response );
+        $this->assertTrue( is_wp_error( $response ) );
     }
 }