Changeset 46682

Timestamp:

11/09/2019 03:36:19 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Skip test_readme() if the HTTP request to secure.php.net or dev.mysql.com failed on timeout.

Move skipTestOnTimeout() to WP_UnitTestCase_Base to avoid duplication.

See #44613.

Location:

trunk/tests/phpunit

Files:

• includes/abstract-testcase.php (modified) (2 diffs)
• tests/external-http/basic.php (modified) (2 diffs)
• tests/http/base.php (modified) (1 diff)
• tests/http/functions.php (modified) (1 diff)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -181 +181 @@
 
     /**
-     * Allow tests to be skipped on some automated runs
+     * Allow tests to be skipped on some automated runs.
      *
      * For test runs on Travis for something other than trunk/master
@@ -221 +221 @@
             $this->markTestSkipped( 'Test does not run on Multisite' );
         }
+    }
+
+    /**
+     * Allow tests to be skipped if the HTTP request times out.
+     *
+     * @param array|WP_Error $response HTTP response.
+     */
+    public function skipTestOnTimeout( $response ) {
+        if ( ! is_wp_error( $response ) ) {
+            return;
+        }
+        if ( 'connect() timed out!' === $response->get_error_message() ) {
+            $this->markTestSkipped( 'HTTP timeout' );
+        }
+
+        if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) {
+            $this->markTestSkipped( 'HTTP timeout' );
+        }
+
+        if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) {
+            $this->markTestSkipped( 'HTTP timeout' );
+        }
+
     }
 

trunk/tests/phpunit/tests/external-http/basic.php

@@ -14 +14 @@
 
         $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' );
+
+        $this->skipTestOnTimeout( $response );
+
         if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
             $this->fail( 'Could not contact PHP.net to check versions.' );
         }
+
         $php = wp_remote_retrieve_body( $response );
 
@@ -26 +30 @@
 
         $response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" );
+
+        $this->skipTestOnTimeout( $response );
+
         if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
             $this->fail( 'Could not contact dev.MySQL.com to check versions.' );
         }
+
         $mysql = wp_remote_retrieve_body( $response );
 

trunk/tests/phpunit/tests/http/base.php

@@ -18 +18 @@
     protected $http_request_args;
 
-    /**
-     * Mark test as skipped if the HTTP request times out.
-     */
-    function skipTestOnTimeout( $response ) {
-        if ( ! is_wp_error( $response ) ) {
-            return;
-        }
-        if ( 'connect() timed out!' === $response->get_error_message() ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-        if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-        if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-    }
-
     function setUp() {
         parent::setUp();

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

@@ -6 +6 @@
  */
 class Tests_HTTP_Functions extends WP_UnitTestCase {
-
-    /**
-     * Mark test as skipped if the HTTP request times out.
-     */
-    function skipTestOnTimeout( $response ) {
-        if ( ! is_wp_error( $response ) ) {
-            return;
-        }
-        if ( 'connect() timed out!' === $response->get_error_message() ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-        if ( false !== strpos( $response->get_error_message(), 'timed out after' ) ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-        if ( 0 === strpos( $response->get_error_message(), 'stream_socket_client(): unable to connect to tcp://s.w.org:80' ) ) {
-            $this->markTestSkipped( 'HTTP timeout' );
-        }
-
-    }
 
     public function setUp() {