Changeset 50098 for branches/4.6/tests/phpunit/includes/testcase.php

Timestamp:

01/30/2021 03:26:00 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move skipTestOnTimeout() to a more appropriate location, for consistency with other branches.

Follow-up to [50088].

Merges [50097] to the 4.6 branch.
See #51669.

File:

• branches/4.6/tests/phpunit/includes/testcase.php (modified) (2 diffs)

branches/4.6/tests/phpunit/includes/testcase.php

@@ -184 +184 @@
 
     /**
+     * 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' );
+        }
+
+    }
+
+    /**
      * Unregister existing post types and register defaults.
      *
@@ -218 +241 @@
             _unregister_post_status( $post_status );
         }
-    }
-
-    /**
-     * 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' );
-        }
-
     }