Changeset 59729 for trunk/tests/phpunit/tests/http/functions.php

Timestamp:

01/29/2025 06:17:34 PM (3 months ago)

Author:

johnbillion

Message:

Build/Test Tools: Add a retry mechanism for tests that perform external HTTP requests.

While the skipTestOnTimeout() method will catch a timeout and prevent it from causing a test to fail, other errors such as a failed DNS lookup or HTTPS handshake can still cause a test to unnecessarily fail. This introduces a simple retry mechanism that will hopefully further reduce the flakiness of tests that perform HTTP API requests.

Fixes #62830

File:

• trunk/tests/phpunit/tests/http/functions.php (modified) (11 diffs)

trunk/tests/phpunit/tests/http/functions.php

@@ -13 +13 @@
         // This URL gives a direct 200 response.
         $url      = 'https://s.w.org/screenshots/3.9/dashboard.png';
-        $response = wp_remote_head( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_head( $url );
+
         $this->assertNotWPError( $response );
 
@@ -32 +31 @@
         // This URL will 301 redirect.
         $url      = 'https://wp.org/screenshots/3.9/dashboard.png';
-        $response = wp_remote_head( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_head( $url );
+
         $this->assertNotWPError( $response );
         $this->assertSame( 301, wp_remote_retrieve_response_code( $response ) );
@@ -44 +42 @@
     public function test_head_404() {
         $url      = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg';
-        $response = wp_remote_head( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_head( $url );
+
         $this->assertNotWPError( $response );
         $this->assertSame( 404, wp_remote_retrieve_response_code( $response ) );
@@ -59 +56 @@
         $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
 
-        $response = wp_remote_get( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_get( $url );
+
         $this->assertNotWPError( $response );
 
@@ -81 +77 @@
         $url = 'https://wp.org/screenshots/3.9/dashboard.png';
 
-        $response = wp_remote_get( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_get( $url );
+
         $this->assertNotWPError( $response );
 
@@ -102 +97 @@
 
         // Pretend we've already redirected 5 times.
-        $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_get( $url, array( 'redirection' => -1 ) );
+
         $this->assertWPError( $response );
     }
@@ -119 +113 @@
         $url = 'https://login.wordpress.org/wp-login.php';
 
-        $response = wp_remote_head( $url );
-
-        $this->skipTestOnTimeout( $response );
+        $response = $this->wp_remote_head( $url );
+
         $this->assertNotWPError( $response );
 
@@ -153 +146 @@
         $url = 'https://login.wordpress.org/wp-login.php';
 
-        $response = wp_remote_get(
+        $response = $this->wp_remote_get(
             $url,
             array(
@@ -167 +160 @@
         );
 
-        $this->skipTestOnTimeout( $response );
         $this->assertNotWPError( $response );
 
@@ -190 +182 @@
         $url = 'https://login.wordpress.org/wp-login.php';
 
-        $response = wp_remote_get(
+        $response = $this->wp_remote_get(
             $url,
             array(
@@ -199 +191 @@
         );
 
-        $this->skipTestOnTimeout( $response );
         $this->assertNotWPError( $response );