bug fix on phpunit

Author: miya0001

bin/install-wp-tests.sh

@@ -87,8 +87,24 @@ install_test_suite() {
 }
 
 install_db() {
+	# parse DB_HOST for port or socket references
+	local PARTS=(${DB_HOST//\:/ })
+	local DB_HOSTNAME=${PARTS[0]};
+	local DB_SOCK_OR_PORT=${PARTS[1]};
+	local EXTRA=""
+
+	if ! [ -z $DB_HOSTNAME ] ; then
+		if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
+			EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
+		elif ! [ -z $DB_SOCK_OR_PORT ] ; then
+			EXTRA=" --socket=$DB_SOCK_OR_PORT"
+		elif ! [ -z $DB_HOSTNAME ] ; then
+			EXTRA=" --host=$DB_HOSTNAME --protocol=tcp"
+		fi
+	fi
+
 	# create database
-	mysql -e 'CREATE DATABASE IF NOT EXISTS $DB_NAME;' -uroot
+	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
 }
 
 install_wp

tests/bootstrap.php

@@ -1,13 +1,9 @@
 <?php
-
 $_tests_dir = getenv('WP_TESTS_DIR');
 if ( !$_tests_dir ) $_tests_dir = '/tmp/wordpress-tests-lib';
-
 require_once $_tests_dir . '/includes/functions.php';
-
 function _manually_load_plugin() {
 	require dirname( __FILE__ ) . '/../lib/functions.php';
 }
 tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
-
 require $_tests_dir . '/includes/bootstrap.php';