Mercurial > hg > nginx-tests
view config_dump.t @ 1905:f35824e75b66
Tests: fixed reading QUIC streams on Perl < 5.24.
The parse_stream() routine has had a missing explicit return if there were no
streams received. In Perl < 5.24 this used to return no value, or an empty
array in the list context. In modern Perl this returns an empty value, or an
array of 1 element, which made the check for last index of the returned array
work rather by accident.
The fix is to return explicitly and to check the array size in callers instead.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Tue, 06 Jun 2023 18:50:07 +0400 |
parents | 9d579fc770a6 |
children |
line wrap: on
line source
#!/usr/bin/perl # (C) Sergey Kandaurov # (C) Nginx, Inc. # Tests for dumped nginx configuration (nginx -T). # Among other things, test that configuration blocks are properly processed. ############################################################################### 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; my $t = Test::Nginx->new()->has(qw/http map/); $t->plan(13)->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% daemon off; include %%TESTDIR%%/inc.conf; include %%TESTDIR%%/inc.conf; events { } http { %%TEST_GLOBALS_HTTP%% map $args $x { default 0; foo bar; include map.conf; include map.conf; } upstream u { server 127.0.0.1:8081; } server { listen 127.0.0.1:8080; server_name localhost; location / { } } } EOF $t->write_file('inc.conf', 'include inc2.conf;'); $t->write_file('inc2.conf', '#inc2.conf'); $t->write_file('map.conf', '#map.conf;'); $t->run(); ############################################################################### my $d = $t->testdir; my $dump = $t->dump_config(); like($dump, qr!^# configuration file $d/nginx.conf:$!m, 'nginx.conf found'); like($dump, qr!^# configuration file $d/inc.conf:$!m, 'inc.conf found'); like($dump, qr!^# configuration file $d/inc2.conf:$!m, 'inc2.conf found'); like($dump, qr!^# configuration file $d/map.conf:$!m, 'map.conf found'); unlike($dump, qr!(# configuration file $d/inc.conf:).*\1!s, 'inc.conf uniq'); unlike($dump, qr!(# configuration file $d/inc2.conf:).*\1!s, 'inc2.conf uniq'); unlike($dump, qr!(# configuration file $d/map.conf:).*\1!s, 'map.conf uniq'); is(getconf($t, $dump, 'nginx.conf'), $t->read_file('nginx.conf'), 'content'); is(getconf($t, $dump, 'inc.conf'), $t->read_file('inc.conf'), 'content inc'); is(getconf($t, $dump, 'map.conf'), $t->read_file('map.conf'), 'content inc 2'); unlink($t->testdir . "/inc.conf"); unlink($t->testdir . "/map.conf"); $dump = $t->dump_config(); unlike($dump, qr!file $d/inc.conf!, 'missing inc.conf'); unlike($dump, qr!file $d/map.conf!, 'missing map.conf'); like($dump, qr!file $d/nginx.conf test failed!, 'test failed'); $t->write_file('inc.conf', 'include inc2.conf;'); $t->write_file('inc2.conf', '#inc2.conf'); $t->write_file('map.conf', '#map.conf;'); ############################################################################### sub getconf { my ($t, $string, $conf) = @_; my $prefix = "# configuration file $d/$conf:\n"; my $offset = index($string, $prefix) + length($prefix); my $len = length($t->read_file($conf)); my $s = substr($string, $offset, $len); $s =~ tr/\r//d; return $s; } ###############################################################################