Remove WaitForNothing. WaitForContainerRunning can be used as a basic implementation instead.

This commit is contained in:
Sergei Shitikov
2024-09-01 17:05:31 +02:00
parent de66ea607c
commit 3dd4d2525a
4 changed files with 7 additions and 15 deletions
+3
View File
@@ -4,12 +4,15 @@ declare(strict_types=1);
namespace Testcontainers\Container;
use Testcontainers\Wait\WaitForLog;
class MariaDBContainer extends GenericContainer
{
public function __construct(string $version = 'latest', string $mysqlRootPassword = 'root')
{
parent::__construct('mariadb:' . $version);
$this->withExposedPorts(3306);
$this->withWait(new WaitForLog('ready for connections'));
$this->withEnvironment('MARIADB_ROOT_PASSWORD', $mysqlRootPassword);
}
+3 -1
View File
@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace Testcontainers\Container;
use Testcontainers\Wait\WaitForExec;
use Testcontainers\Wait\WaitForLog;
class MySQLContainer extends GenericContainer
{
@@ -12,6 +12,8 @@ class MySQLContainer extends GenericContainer
{
parent::__construct('mysql:' . $version);
$this->withExposedPorts(3306);
$this->withWait(new WaitForLog('ready for connections'));
$this->withEnvironment('MYSQL_ROOT_PASSWORD', $mysqlRootPassword);
}
-13
View File
@@ -1,13 +0,0 @@
<?php
declare(strict_types=1);
namespace Testcontainers\Wait;
class WaitForNothing implements WaitInterface
{
public function wait(string $id): void
{
// does nothing
}
}
+1 -1
View File
@@ -16,7 +16,7 @@ class MariaDBContainerTest extends ContainerTestCase
->start();
}
public function testMySQLContainer(): void
public function testMariaDBContainer(): void
{
$pdo = new \PDO(
sprintf('mysql:host=%s;port=3306', self::$container->getAddress()),