Skip to content

Commit ea3a317

Browse files
committedJun 18, 2020
Fix race condition in FPM tests
The newly de-XFAILed tests have a race condition. Make sure we terminate only after expecting all the log lines.
1 parent 76ca6bf commit ea3a317

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ $tester->start();
3434
$tester->expectLogStartNotices();
3535
$tester->request()->expectEmptyBody();
3636
$tester->request()->expectEmptyBody();
37-
$tester->terminate();
3837
$tester->expectLogLine('msg 1 - ', false);
3938
$tester->expectLogLine('msg 2 - msg 3', true);
39+
$tester->terminate();
4040
$tester->close();
4141

4242
?>

‎sapi/fpm/tests/log-bwd-multiple-msgs.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ $tester->start();
3434
$tester->expectLogStartNotices();
3535
$tester->request()->expectEmptyBody();
3636
$tester->request()->expectEmptyBody();
37-
$tester->terminate();
3837
$tester->expectLogLine('msg 1 - msg 2 - msg 3');
3938
$tester->expectLogLine('msg 1 - msg 2 - msg 3');
39+
$tester->terminate();
4040
$tester->close();
4141
?>
4242
Done

0 commit comments

Comments
 (0)
Please sign in to comment.