diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 17:01:29 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-18 17:01:29 +0200 |
| commit | ea3a317659b7c7418dabb4d78ae88e74d810812b (patch) | |
| tree | f194ce5d619e18ab7d4070fa76122804f3a4c350 | |
| parent | 76ca6bf3eff437f0493bbdd87bdfb6569ca56501 (diff) | |
| download | php-git-ea3a317659b7c7418dabb4d78ae88e74d810812b.tar.gz | |
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.
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt | 2 | ||||
| -rw-r--r-- | sapi/fpm/tests/log-bwd-multiple-msgs.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt index 376a972bac..b1b8a65c68 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt @@ -34,9 +34,9 @@ $tester->start(); $tester->expectLogStartNotices(); $tester->request()->expectEmptyBody(); $tester->request()->expectEmptyBody(); -$tester->terminate(); $tester->expectLogLine('msg 1 - ', false); $tester->expectLogLine('msg 2 - msg 3', true); +$tester->terminate(); $tester->close(); ?> diff --git a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt index b221a8344c..d328aff9db 100644 --- a/sapi/fpm/tests/log-bwd-multiple-msgs.phpt +++ b/sapi/fpm/tests/log-bwd-multiple-msgs.phpt @@ -34,9 +34,9 @@ $tester->start(); $tester->expectLogStartNotices(); $tester->request()->expectEmptyBody(); $tester->request()->expectEmptyBody(); -$tester->terminate(); $tester->expectLogLine('msg 1 - msg 2 - msg 3'); $tester->expectLogLine('msg 1 - msg 2 - msg 3'); +$tester->terminate(); $tester->close(); ?> Done |