Commit fbf951e8 authored by catch's avatar catch
Browse files

Issue #3265291 by xjm, neclimdul, longwave, Spokje: QuickStartTest: The waiting is the hardest part

(cherry picked from commit c97eb132)
parent db4c9ef9
...@@ -108,14 +108,12 @@ public function testQuickStartCommand() { ...@@ -108,14 +108,12 @@ public function testQuickStartCommand() {
$process->start(); $process->start();
$guzzle = new Client(); $guzzle = new Client();
$port = FALSE; $port = FALSE;
while ($process->isRunning()) { $process->waitUntil(function ($type, $output) use (&$port) {
if (preg_match('/127.0.0.1:(\d+)/', $process->getOutput(), $match)) { if (preg_match('/127.0.0.1:(\d+)/', $output, $match)) {
$port = $match[1]; $port = $match[1];
break; return TRUE;
} }
// Wait for more output. });
sleep(1);
}
// The progress bar uses STDERR to write messages. // The progress bar uses STDERR to write messages.
$this->assertStringContainsString('Congratulations, you installed Drupal!', $process->getErrorOutput()); $this->assertStringContainsString('Congratulations, you installed Drupal!', $process->getErrorOutput());
$this->assertNotFalse($port, "Web server running on port $port"); $this->assertNotFalse($port, "Web server running on port $port");
...@@ -157,12 +155,7 @@ public function testPhpRequirement() { ...@@ -157,12 +155,7 @@ public function testPhpRequirement() {
]; ];
$process = new Process($install_command, NULL, ['DRUPAL_DEV_SITE_PATH' => $this->testDb->getTestSitePath()]); $process = new Process($install_command, NULL, ['DRUPAL_DEV_SITE_PATH' => $this->testDb->getTestSitePath()]);
$process->setTimeout(500); $process->setTimeout(500);
$process->start(); $process->run();
while ($process->isRunning()) {
// Wait for more output.
sleep(1);
}
$error_output = $process->getErrorOutput(); $error_output = $process->getErrorOutput();
$this->assertStringContainsString('Your PHP installation is too old.', $error_output); $this->assertStringContainsString('Your PHP installation is too old.', $error_output);
$this->assertStringContainsString('Drupal requires at least PHP', $error_output); $this->assertStringContainsString('Drupal requires at least PHP', $error_output);
...@@ -209,14 +202,12 @@ public function testQuickStartInstallAndServerCommands() { ...@@ -209,14 +202,12 @@ public function testQuickStartInstallAndServerCommands() {
$server_process->start(); $server_process->start();
$guzzle = new Client(); $guzzle = new Client();
$port = FALSE; $port = FALSE;
while ($server_process->isRunning()) { $server_process->waitUntil(function ($type, $output) use (&$port) {
if (preg_match('/127.0.0.1:(\d+)/', $server_process->getOutput(), $match)) { if (preg_match('/127.0.0.1:(\d+)\/user\/reset\/1\//', $output, $match)) {
$port = $match[1]; $port = $match[1];
break; return TRUE;
} }
// Wait for more output. });
sleep(1);
}
$this->assertEquals('', $server_process->getErrorOutput()); $this->assertEquals('', $server_process->getErrorOutput());
$this->assertStringContainsString("127.0.0.1:$port/user/reset/1/", $server_process->getOutput()); $this->assertStringContainsString("127.0.0.1:$port/user/reset/1/", $server_process->getOutput());
$this->assertNotFalse($port, "Web server running on port $port"); $this->assertNotFalse($port, "Web server running on port $port");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment