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

SergeyBiryukov · SergeyBiryukov · commit c0f53ac48f8e · 2021-01-30T15:21:27.000Z
Follow-up to [50088]. See #51669. git-svn-id: https://develop.svn.wordpress.org/branches/4.7@50097 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/tests/phpunit/includes/testcase.php b/tests/phpunit/includes/testcase.php
@@ -197,6 +197,29 @@ public function skipOnAutomatedBranches() {
 		}
 	}
 
+	/**
+	 * 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.
 	 *
@@ -233,29 +256,6 @@ protected function reset_post_statuses() {
 			_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' );
-		}
-
-	}
 
 	/**
 	 * Reset `$_SERVER` variables
