Update scaffolded tests to enable error reporting

Author: danielbachhuber

.travis.yml

@@ -24,6 +24,8 @@ env:
 
 matrix:
   include:
+    - php: 7.2
+      env: WP_VERSION=nightly
     - php: 7.1
       env: WP_VERSION=latest
     - php: 7.0

bin/install-package-tests.sh

@@ -5,6 +5,7 @@ set -ex
 install_db() {
 	mysql -e 'CREATE DATABASE IF NOT EXISTS wp_cli_test;' -uroot
 	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test.* TO "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot
+	mysql -e 'GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO "wp_cli_test"@"localhost" IDENTIFIED BY "password1"' -uroot
 }
 
 install_db

features/bootstrap/FeatureContext.php

@@ -131,6 +131,12 @@ private static function get_process_env_variables() {
 		if ( $php_args = getenv( 'WP_CLI_PHP_ARGS' ) ) {
 			$env['WP_CLI_PHP_ARGS'] = $php_args;
 		}
+		if ( $php_used = getenv( 'WP_CLI_PHP_USED' ) ) {
+			$env['WP_CLI_PHP_USED'] = $php_used;
+		}
+		if ( $php = getenv( 'WP_CLI_PHP' ) ) {
+			$env['WP_CLI_PHP'] = $php;
+		}
 		if ( $travis_build_dir = getenv( 'TRAVIS_BUILD_DIR' ) ) {
 			$env['TRAVIS_BUILD_DIR'] = $travis_build_dir;
 		}
@@ -526,7 +532,8 @@ public function background_proc( $cmd ) {
 		$status = proc_get_status( $proc );
 
 		if ( !$status['running'] ) {
-			throw new RuntimeException( stream_get_contents( $pipes[2] ) );
+			$stderr = is_resource( $pipes[2] ) ? ( ': ' . stream_get_contents( $pipes[2] ) ) : '';
+			throw new RuntimeException( sprintf( "Failed to start background process '%s'%s.", $cmd, $stderr ) );
 		} else {
 			$this->running_procs[] = $proc;
 		}
@@ -617,7 +624,8 @@ public function install_wp( $subdir = '' ) {
 			'title' => 'WP CLI Site',
 			'admin_user' => 'admin',
 			'admin_email' => 'admin@example.com',
-			'admin_password' => 'password1'
+			'admin_password' => 'password1',
+			'skip-email' => true,
 		);
 
 		$install_cache_path = '';
@@ -658,7 +666,8 @@ public function install_wp_with_composer( $vendor_directory = 'vendor' ) {
 			'title' => 'WP CLI Site with both WordPress and wp-cli as Composer dependencies',
 			'admin_user' => 'admin',
 			'admin_email' => 'admin@example.com',
-			'admin_password' => 'password1'
+			'admin_password' => 'password1',
+			'skip-email' => true,
 		);
 
 		$this->proc( 'wp core install', $install_args )->run_check();
@@ -686,26 +695,13 @@ public function composer_require_current_wp_cli() {
 		$this->composer_command( 'require wp-cli/wp-cli:dev-master --optimize-autoloader --no-interaction' );
 	}
 
-	public function get_php_binary() {
-		if ( getenv( 'WP_CLI_PHP_USED' ) )
-			return getenv( 'WP_CLI_PHP_USED' );
-
-		if ( getenv( 'WP_CLI_PHP' ) )
-			return getenv( 'WP_CLI_PHP' );
-
-		if ( defined( 'PHP_BINARY' ) )
-			return PHP_BINARY;
-
-		return 'php';
-	}
-
 	public function start_php_server( $subdir = '' ) {
 		$dir = $this->variables['RUN_DIR'] . '/';
 		if ( $subdir ) {
 			$dir .= trim( $subdir, '/' ) . '/';
 		}
 		$cmd = Utils\esc_cmd( '%s -S %s -t %s -c %s %s',
-			$this->get_php_binary(),
+			Utils\get_php_binary(),
 			'localhost:8080',
 			$dir,
 			get_cfg_var( 'cfg_file_path' ),

features/bootstrap/Process.php

@@ -115,4 +115,20 @@ public function run_check() {
 
 		return $r;
 	}
+
+	/**
+	 * Run the command, but throw an Exception on error.
+	 * Same as `run_check()` above, but checks the correct stderr.
+	 *
+	 * @return ProcessRun
+	 */
+	public function run_check_stderr() {
+		$r = $this->run();
+
+		if ( $r->return_code || ! empty( $r->stderr ) ) {
+			throw new \RuntimeException( $r );
+		}
+
+		return $r;
+	}
 }

features/bootstrap/support.php

@@ -2,6 +2,12 @@
 
 // Utility functions used by Behat steps
 
+function assertRegExp( $regex, $actual ) {
+	if ( ! preg_match( $regex, $actual ) ) {
+		throw new Exception( "Actual value: " . var_export( $actual, true ) );
+	}
+}
+
 function assertEquals( $expected, $actual ) {
 	if ( $expected != $actual ) {
 		throw new Exception( "Actual value: " . var_export( $actual, true ) );