Mercurial > hg > nginx-tests
view binary_upgrade.t @ 1897:38f1fd9ca3e6
Tests: unbreak reading new stderr data after eof.
Tests don't expect to stop reading redirected stderr when end of file is
reached, but rather to read new data being appended, similar to "tail -f".
The behaviour is found changed in Ubuntu 23.04's Perl 5.36, which applies
the upstream patch [1] expected for inclusion in the upcoming Perl 5.38.
The fix is to clear the filehandle's error state to continue reading.
[1] https://github.com/Perl/perl5/commit/80c1f1e45e8e
Updated mail_error_log.t and stream_error_log.t for consistency.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 29 May 2023 17:27:11 +0400 |
parents | 5ac6efbe5552 |
children |
line wrap: on
line source
#!/usr/bin/perl # (C) Sergey Kandaurov # (C) Nginx, Inc. # Tests for binary upgrade. ############################################################################### use warnings; use strict; use Test::More; BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; use Test::Nginx; ############################################################################### select STDERR; $| = 1; select STDOUT; $| = 1; plan(skip_all => 'can leave orphaned process group') unless $ENV{TEST_NGINX_UNSAFE}; my $t = Test::Nginx->new(qr/http unix/)->plan(4) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% events { } http { %%TEST_GLOBALS_HTTP%% server { listen unix:%%TESTDIR%%/unix.sock; server_name localhost; } } EOF my $d = $t->testdir(); $t->run(); ############################################################################### my $pid = $t->read_file('nginx.pid'); ok($pid, 'master pid'); kill 'USR2', $pid; for (1 .. 30) { last if -e "$d/nginx.pid" && -e "$d/nginx.pid.oldbin"; select undef, undef, undef, 0.2 } isnt($t->read_file('nginx.pid'), $pid, 'master pid changed'); kill 'QUIT', $pid; for (1 .. 30) { last if ! -e "$d/nginx.pid.oldbin"; select undef, undef, undef, 0.2 } ok(-e "$d/unix.sock", 'unix socket exists on old master shutdown'); # unix socket on new master termination $pid = $t->read_file('nginx.pid'); kill 'USR2', $pid; for (1 .. 30) { last if -e "$d/nginx.pid" && -e "$d/nginx.pid.oldbin"; select undef, undef, undef, 0.2 } kill 'TERM', $t->read_file('nginx.pid'); for (1 .. 30) { last if ! -e "$d/nginx.pid.oldbin"; select undef, undef, undef, 0.2 } ok(-e "$d/unix.sock", 'unix socket exists on new master termination'); ###############################################################################