Changeset 41966

Timestamp:

10/21/2017 02:13:37 PM (8 years ago)

Author:

dd32

Message:

Tests: Return an exit code of 1 in the event that the database server for tests is unavailable.
This allows for automated scripts & test suites to handle the failure of the test suite easier.

Props danielbachhuber
Fixes #41916

Location:

trunk/tests/phpunit/includes

Files:

• bootstrap.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• install.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -66 +66 @@
 $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 ) {

trunk/tests/phpunit/includes/functions.php

@@ -116 +116 @@
 }
 
+function _wp_die_handler_filter_exit() {
+    return '_wp_die_handler_exit';
+}
+
 function _wp_die_handler_txt( $message, $title, $args ) {
     echo "\nwp_die called\n";
@@ -126 +130 @@
         }
     }
+}
+
+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 );
 }
 

trunk/tests/phpunit/includes/install.php

@@ -22 +22 @@
 
 $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';