Ticket #41916: 41916.1.diff

tests/phpunit/includes/bootstrap.php

@@ -65 +65 @@
 }
 $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 ) {
         echo "Running as multisite..." . PHP_EOL;

tests/phpunit/includes/functions.php

@@ -115 +115 @@
         return '_wp_die_handler';
 }
 
+function _wp_die_handler_filter_exit() {
+        return '_wp_die_handler_exit';
+}
+
 function _wp_die_handler_txt( $message, $title, $args ) {
         echo "\nwp_die called\n";
         echo "Message : $message\n";
@@ -127 +131 @@
         }
 }
 
+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.
  *

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';
 
 require_once ABSPATH . '/wp-admin/includes/upgrade.php';