sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Move `skipTestOnTimeout()` to `WP_UnitTestCase_Base` to avoid duplication.

See #44613.

git-svn-id: https://develop.svn.wordpress.org/trunk@46682 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-11-09 03:36:19 +00:00
parent 9b1fc27c3f
commit fcf86b80b6
4 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/phpunit/includes/abstract-testcase.php
View File

@ -180,7 +180,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Framework_TestCase {
} }
/** /**
* 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 * For test runs on Travis for something other than trunk/master
* we want to skip tests that only need to run for master. * we want to skip tests that only need to run for master.
@ -222,6 +222,29 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Framework_TestCase {
} }
} }
/**
* 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. * Unregister existing post types and register defaults.
* *

8
tests/phpunit/tests/external-http/basic.php
View File

@ -13,9 +13,13 @@ class Tests_External_HTTP_Basic extends WP_UnitTestCase {
preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches ); preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches );
$response = wp_remote_get( 'https://secure.php.net/supported-versions.php' ); $response = wp_remote_get( 'https://secure.php.net/supported-versions.php' );
$this->skipTestOnTimeout( $response );
if ( 200 !== wp_remote_retrieve_response_code( $response ) ) { if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
$this->fail( 'Could not contact PHP.net to check versions.' ); $this->fail( 'Could not contact PHP.net to check versions.' );
} }
$php = wp_remote_retrieve_body( $response ); $php = wp_remote_retrieve_body( $response );
preg_match_all( '#<tr class="stable">\s*<td>\s*<a [^>]*>\s*([0-9.]*)#s', $php, $phpmatches ); preg_match_all( '#<tr class="stable">\s*<td>\s*<a [^>]*>\s*([0-9.]*)#s', $php, $phpmatches );
@ -25,9 +29,13 @@ class Tests_External_HTTP_Basic extends WP_UnitTestCase {
preg_match( '#Recommendations.*MySQL</a> version <strong>([0-9.]*)#s', $readme, $matches ); preg_match( '#Recommendations.*MySQL</a> version <strong>([0-9.]*)#s', $readme, $matches );
$response = wp_remote_get( "https://dev.mysql.com/doc/relnotes/mysql/{$matches[1]}/en/" ); $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 ) ) { if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
$this->fail( 'Could not contact dev.MySQL.com to check versions.' ); $this->fail( 'Could not contact dev.MySQL.com to check versions.' );
} }
$mysql = wp_remote_retrieve_body( $response ); $mysql = wp_remote_retrieve_body( $response );
preg_match( '#(\d{4}-\d{2}-\d{2}), General Availability#', $mysql, $mysqlmatches ); preg_match( '#(\d{4}-\d{2}-\d{2}), General Availability#', $mysql, $mysqlmatches );

21
tests/phpunit/tests/http/base.php
View File

@ -17,27 +17,6 @@ abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
protected $http_request_args; 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() { function setUp() {
parent::setUp(); parent::setUp();

21
tests/phpunit/tests/http/functions.php
View File

@ -6,27 +6,6 @@
*/ */
class Tests_HTTP_Functions extends WP_UnitTestCase { 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() { public function setUp() {
if ( ! extension_loaded( 'openssl' ) ) { if ( ! extension_loaded( 'openssl' ) ) {
$this->markTestSkipped( 'Tests_HTTP_Functions requires openssl.' ); $this->markTestSkipped( 'Tests_HTTP_Functions requires openssl.' );