# HG changeset patch # User Maxim Dounin # Date 1336818422 -14400 # Node ID ea574aae77cb53f88be34c6b7db159a22417c1b6 # Parent f2f37a52e42ed4822a8d6509c7d19450b6197eca Tests: unbreak geo and realip tests in jails. There is no real 127.0.0.1 in jails, skip these tests if 127.0.0.1 isn't here. diff --git a/geo.t b/geo.t --- a/geo.t +++ b/geo.t @@ -21,7 +21,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http geo/)->plan(6); +my $t = Test::Nginx->new()->has(qw/http geo/); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -60,6 +60,7 @@ http { server_name localhost; location / { + add_header X-IP $remote_addr; add_header X-Geo $geo; add_header X-Arg $geo_from_arg; add_header X-XFF $geo_proxy; @@ -72,6 +73,11 @@ EOF $t->write_file('1', ''); $t->run(); +plan(skip_all => 'no 127.0.0.1 on host') + if http_get('/1') !~ /X-IP: 127.0.0.1/m; + +$t->plan(6); + ############################################################################### like(http_get('/1'), qr/^X-Geo: loopback/m, 'geo'); diff --git a/realip.t b/realip.t --- a/realip.t +++ b/realip.t @@ -21,7 +21,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http realip/)->plan(3); +my $t = Test::Nginx->new()->has(qw/http realip/); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -53,9 +53,12 @@ EOF $t->write_file('1', ''); $t->run(); -############################################################################### +plan(skip_all => 'no 127.0.0.1 on host') + if http_get('/1') !~ /X-IP: 127.0.0.1/m; -like(http_get('/1'), qr/^X-IP: 127.0.0.1/m, 'realip no ip'); +$t->plan(2); + +############################################################################### like(http_xff('192.0.2.1'), qr/^X-IP: 192.0.2.1/m, 'realip'); like(http_xff('10.0.0.1, 192.0.2.1'), qr/^X-IP: 192.0.2.1/m, 'realip multi');