Skip to content

Fix flaky FPM log-bwd-multiple-msgs-stdout-stderr test and remove XFAIL #24998

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 28, 2026
Merged

Fix flaky FPM log-bwd-multiple-msgs-stdout-stderr test and remove XFAIL #24998

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
5 changes: 3 additions & 2 deletions sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
FPM: Buffered worker output decorated log with multiple continuous messages (stdout/stderr mixed)
--SKIPIF--
<?php include "skipif.inc"; ?>
--XFAIL--
Fails intermittently
--FILE--
<?php

Expand Down Expand Up @@ -34,7 +32,10 @@ EOT;
$tester = new FPM\Tester($cfg, $code);
$tester->start();
$tester->expectLogStartNotices();
// Check logs after each request so a slow master cannot merge the stdout msgs.
$tester->request()->expectEmptyBody();
$tester->expectLogLine('msg 1 - ', false);
$tester->expectLogLine('msg 2 - msg 3', true);
$tester->request()->expectEmptyBody();
$tester->expectLogLine('msg 1 - ', false);
$tester->expectLogLine('msg 2 - msg 3', true);
Expand Down
Loading