From 25a18eec020f30e8ae69784a918850160408cdec Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 17 Nov 2026 17:01:55 +0000 Subject: [PATCH] Give the Docker workers the database host, port and socket The GitHub Actions workflows set MYSQL_HOST, MYSQL_TCP_PORT and WP_CLI_TEST_DBSOCKET for the database server of the runner, and scenarios use them through {MYSQL_HOST}, {MYSQL_PORT} and {DB_SOCKET}. The Docker workers passed on none of them, and had no socket to connect through, so scenarios such as those of wp-cli/config-command that connect through the socket or with the mysql client failed as soon as they ran in containers. Set all three for the worker's own database container, whose socket is now in a directory of the host that both containers mount. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01UWTd5pgZgbJQL9QCPAUWvf --- utils/behat-parallel.php | 42 ++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/utils/behat-parallel.php b/utils/behat-parallel.php index eb2fa976..e1e0d5fd 100644 --- a/utils/behat-parallel.php +++ b/utils/behat-parallel.php @@ -32,6 +32,11 @@ */ const WP_CLI_TESTS_SHARED_RESOURCES = '#localhost:\d+|127\.0\.0\.1:\d+|built-in web server|launch in the background|\bwp server\b|_scaffold\b|install-wp-tests|/tmp/#'; +/** + * Directory in which the database container of a Docker worker puts its socket, in both of its containers. + */ +const WP_CLI_TESTS_DOCKER_SOCKET_DIR = '/run/wp-cli-tests-mysqld'; + /** * Get the file that holds the scenarios which failed in the last parallel run. * @@ -592,23 +597,40 @@ function wp_cli_tests_docker_worker_command( $name, $php_image, $db_image, array $network = ''; $label = ' --label ' . escapeshellarg( 'wp-cli-tests.owner=' . wp_cli_tests_docker_owner() ); + $env = [ + 'HOME' => '/tmp/home', + 'WP_CLI_TEST_DBHOST' => '127.0.0.1:3306', + 'WP_CLI_TEST_DBROOTUSER' => 'root', + 'WP_CLI_TEST_DBROOTPASS' => 'root', + ]; + if ( null !== $db_image ) { + // The server's socket is shared with the worker through a directory of the host that both mount, + // so that scenarios can connect through the socket as well as over TCP. + $socket_dir = sys_get_temp_dir() . "/{$name}-mysqld"; + // The server takes the directory over, so it is left as it is when it is there from an earlier run. + if ( ! is_dir( $socket_dir ) ) { + mkdir( $socket_dir, 0777, true ); + chmod( $socket_dir, 0777 ); + } + $socket = WP_CLI_TESTS_DOCKER_SOCKET_DIR . '/mysqld.sock'; + exec( 'docker run -d --rm --name ' . escapeshellarg( "{$name}-db" ) . $label . ' --tmpfs /var/lib/mysql' + . ' -v ' . escapeshellarg( $socket_dir . ':' . WP_CLI_TESTS_DOCKER_SOCKET_DIR ) . ' -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=wp_cli_test -e MYSQL_PASSWORD=password1' - . ' ' . escapeshellarg( $db_image ) . ' ' . wp_cli_tests_docker_db_options( $db_image ) . ' 2>&1' + . ' ' . escapeshellarg( $db_image ) . ' ' . wp_cli_tests_docker_db_options( $db_image ) + . ' --socket=' . escapeshellarg( $socket ) . ' 2>&1' ); // Share the database container's network, so the server is at 127.0.0.1 and nothing else is. $network = ' --network ' . escapeshellarg( "container:{$name}-db" ); - } - $env = [ - 'HOME' => '/tmp/home', - 'WP_CLI_TEST_DBHOST' => '127.0.0.1:3306', - 'WP_CLI_TEST_DBROOTUSER' => 'root', - 'WP_CLI_TEST_DBROOTPASS' => 'root', - ]; + // The settings the GitHub Actions workflows pass for the server of the runner, adapted to the container's. + $env['MYSQL_HOST'] = '127.0.0.1'; + $env['MYSQL_TCP_PORT'] = '3306'; + $env['WP_CLI_TEST_DBSOCKET'] = $socket; + } foreach ( getenv() as $key => $value ) { if ( preg_match( '/^(WP_VERSION|NO_COLOR|CI|GITHUB_TOKEN|WP_CLI_TEST_(DBTYPE|OBJECT_CACHE|CORE_ZIP|QUIET|LOG_RUN_TIMES|PHP_TUNING|WP_VERSION_CACHE_TTL))$/', $key ) ) { @@ -629,6 +651,10 @@ function wp_cli_tests_docker_worker_command( $name, $php_image, $db_image, array } } + if ( null !== $db_image ) { + $command .= ' -v ' . escapeshellarg( sys_get_temp_dir() . "/{$name}-mysqld:" . WP_CLI_TESTS_DOCKER_SOCKET_DIR ); + } + foreach ( $env as $key => $value ) { $command .= ' -e ' . escapeshellarg( "{$key}={$value}" ); }