Changeset 50094

Timestamp:

01/30/2021 01:05:57 PM (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.

Merges [46682] and [46996] to the 5.1 branch.
See #51669.

Location:

branches/5.1

Files:

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

branches/5.1/tests/phpunit/includes/abstract-testcase.php

@@ -173 +173 @@
 
         /**
-         * 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
@@ -213 +213 @@
                         $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' );
+                }
+
         }
 

branches/5.1/tests/phpunit/tests/external-http/basic.php

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

branches/5.1/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();

branches/5.1/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() {