changeset 217:ea574aae77cb

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 12 May 2012 14:27:02 +0400
parents f2f37a52e42e
children 7f4a913d7504
files geo.t realip.t
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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');
--- 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');