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

Tests: Return an exit code of 1 in the event that the database server for tests is unavailable.

Browse Source 
This allows for automated scripts & test suites to handle the failure of the test suite easier.

Props danielbachhuber
Fixes #41916


git-svn-id: https://develop.svn.wordpress.org/trunk@41966 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2017-10-21 14:13:37 +00:00
parent 2ce903ffc3
commit eaa0c3ac04
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/phpunit/includes/bootstrap.php
View File

@ -65,7 +65,10 @@ if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
} }
$wp_theme_directories = array( DIR_TESTDATA . '/themedir1' ); $wp_theme_directories = array( DIR_TESTDATA . '/themedir1' );
system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite ); system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite, $retval );
if ( 0 !== $retval ) {
exit( $retval );
}
if ( $multisite ) { if ( $multisite ) {
echo "Running as multisite..." . PHP_EOL; echo "Running as multisite..." . PHP_EOL;

17
tests/phpunit/includes/functions.php
View File

@ -115,6 +115,10 @@ function _wp_die_handler_filter() {
return '_wp_die_handler'; return '_wp_die_handler';
} }
function _wp_die_handler_filter_exit() {
return '_wp_die_handler_exit';
}
function _wp_die_handler_txt( $message, $title, $args ) { function _wp_die_handler_txt( $message, $title, $args ) {
echo "\nwp_die called\n"; echo "\nwp_die called\n";
echo "Message : $message\n"; echo "Message : $message\n";
@ -127,6 +131,19 @@ function _wp_die_handler_txt( $message, $title, $args ) {
} }
} }
function _wp_die_handler_exit( $message, $title, $args ) {
echo "\nwp_die called\n";
echo "Message : $message\n";
echo "Title : $title\n";
if ( ! empty( $args ) ) {
echo "Args: \n";
foreach( $args as $k => $v ){
echo "\t $k : $v\n";
}
}
exit( 1 );
}
/** /**
* Set a permalink structure. * Set a permalink structure.
* *

2
tests/phpunit/includes/install.php
View File

@ -22,6 +22,8 @@ tests_reset__SERVER();
$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php'; $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter_exit' );
require_once ABSPATH . '/wp-settings.php'; require_once ABSPATH . '/wp-settings.php';
require_once ABSPATH . '/wp-admin/includes/upgrade.php'; require_once ABSPATH . '/wp-admin/includes/upgrade.php';