Mercurial > hg > nginx-tests
view stream_geo_unix.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 | f3ba4c74de31 |
children |
line wrap: on
line source
#!/usr/bin/perl # (C) Sergey Kandaurov # (C) Nginx, Inc. # Tests for stream geo module with unix socket. ############################################################################### use warnings; use strict; use Test::More; BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; use Test::Nginx; use Test::Nginx::Stream qw/ stream /; ############################################################################### select STDERR; $| = 1; select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/stream stream_geo stream_return unix/) ->plan(4); $t->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% daemon off; events { } stream { %%TEST_GLOBALS_STREAM%% geo $geo { default default; 255.255.255.255 none; } geo $remote_addr $geora { default default; 255.255.255.255 none; } geo $geor { ranges; 0.0.0.0-255.255.255.254 test; default none; } geo $remote_addr $georra { ranges; 0.0.0.0-255.255.255.254 test; default none; } server { listen unix:%%TESTDIR%%/unix.sock; return "geo:$geo geora:$geora geor:$geor georra:$georra"; } server { listen 127.0.0.1:8080; proxy_pass unix:%%TESTDIR%%/unix.sock; } } EOF $t->write_file('index.html', ''); $t->run(); ############################################################################### my %data = stream('127.0.0.1:' . port(8080))->read() =~ /(\w+):(\w+)/g; is($data{geo}, 'none', 'geo unix'); is($data{geor}, 'none', 'geo unix ranges'); is($data{geora}, 'none', 'geo unix remote addr'); is($data{georra}, 'none', 'geo unix ranges remote addr'); ###############################################################################