Changeset 50106 for branches/3.9/tests/phpunit/includes/testcase.php

Timestamp:

01/30/2021 09:28:27 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], [50105] to the 3.9 branch.
See #51669.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• tests/phpunit/includes/testcase.php (modified) (2 diffs)

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

@@ -55 +55 @@
     }
 
-    /**
-     * Unregister existing post types and register defaults.
-     *
-     * Run before each test in order to clean up the global scope, in case
-     * a test forgets to unregister a post type on its own, or fails before
-     * it has a chance to do so.
-     */
-    protected function reset_post_types() {
-        foreach ( get_post_types() as $pt ) {
-            _unregister_post_type( $pt );
-        }
-        create_initial_post_types();
-    }
-
-    /**
-     * Unregister existing taxonomies and register defaults.
-     *
-     * Run before each test in order to clean up the global scope, in case
-     * a test forgets to unregister a taxonomy on its own, or fails before
-     * it has a chance to do so.
-     */
-    protected function reset_taxonomies() {
-        foreach ( get_taxonomies() as $tax ) {
-            _unregister_taxonomy( $tax );
-        }
-        create_initial_taxonomies();
-    }
-
     function tearDown() {
         global $wpdb, $wp_query, $post;
@@ -127 +99 @@
             $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
         }
+    }
+
+    /**
+     * 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.
+     *
+     * Run before each test in order to clean up the global scope, in case
+     * a test forgets to unregister a post type on its own, or fails before
+     * it has a chance to do so.
+     */
+    protected function reset_post_types() {
+        foreach ( get_post_types() as $pt ) {
+            _unregister_post_type( $pt );
+        }
+        create_initial_post_types();
+    }
+
+    /**
+     * Unregister existing taxonomies and register defaults.
+     *
+     * Run before each test in order to clean up the global scope, in case
+     * a test forgets to unregister a taxonomy on its own, or fails before
+     * it has a chance to do so.
+     */
+    protected function reset_taxonomies() {
+        foreach ( get_taxonomies() as $tax ) {
+            _unregister_taxonomy( $tax );
+        }
+        create_initial_taxonomies();
     }