Skip to content

Fix flaky FPM test for bug #77023 #24999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bukka merged 1 commit into from
Oct 29, 2026
Merged

Fix flaky FPM test for bug #77023 #24999

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
FPM: Blocked SIGQUIT prevents idle process to be killed
--EXTENSIONS--
pcntl
--FLAKY--
--SKIPIF--
<?php
include "skipif.inc";
Expand Down Expand Up @@ -32,23 +31,30 @@ EOT;
$code = <<<EOT
<?php
pcntl_sigprocmask(SIG_BLOCK, [SIGQUIT, SIGTERM]);
usleep(300000);
usleep(2000000);
EOT;


$tester = new FPM\Tester($cfg, $code);
$tester->start(extensions: ['pcntl']);
$tester->expectLogStartNotices();
$tester->multiRequest(2);
$tester->request()->expectEmptyBody();
$tester->status([
'total processes' => 2,
]);
// wait for process to be killed
sleep(7);
$tester->expectLogWarning('child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start', 'unconfined');
$tester->expectLogNotice('child \\d+ started', 'unconfined');
$tester->expectLogWarning('child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start', 'unconfined');
$tester->expectLogWarning(
'child \\d+ exited on signal 9 \\(SIGKILL\\) after \\d+.\\d+ seconds from start',
'unconfined',
timeoutSeconds: 10
);
$tester->expectLogNotice('child \\d+ started', 'unconfined');
// wait for the remaining spare process to be quit
for ($i = 0; $i < 20; $i++) {
$status = json_decode($tester->request('json', [], '/status')->getBody('application/json'), true);
if (($status['total processes'] ?? null) === 1) {
break;
}
usleep(500000);
}
$tester->status([
'total processes' => 1,
]);
Expand Down
Loading