Skip to content

Commit 481a7eb

Browse files
committed
Improve flaky php-cli server test
1 parent 12b9196 commit 481a7eb

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

sapi/cli/tests/php_cli_server_pdeathsig.phpt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,18 @@ if (count($workersBefore) === 0) {
3535

3636
proc_terminate($cliServerInfo->processHandle, 9); // SIGKILL
3737

38-
usleep(10000);
39-
40-
$workersAfter = find_workers_by_pids($workersBefore);
41-
if (count($workersAfter) !== 0) {
42-
throw new \Exception('Workers were not properly terminated. Before: ' . join(', ', $workersBefore) . ', after: ' . join(', ', $workersAfter));
38+
$try = 1;
39+
$max_tries = 5;
40+
while (true) {
41+
$workersAfter = find_workers_by_pids($workersBefore);
42+
if (count($workersAfter) === 0) {
43+
break;
44+
}
45+
if ($try >= $max_tries) {
46+
throw new \Exception('Workers were not properly terminated. Before: ' . join(', ', $workersBefore) . ', after: ' . join(', ', $workersAfter));
47+
}
48+
$try++;
49+
usleep(100_000);
4350
}
4451

4552
echo 'Done';

0 commit comments

Comments
 (0)