# HG changeset patch
# User Andrey Zelenkov <zelenkov@nginx.com>
# Date 1472218254 -10800
# Node ID a0758fe11465fce9521086527bb2df7018917c7b
# Parent  9b87810c75ca5a1a9de85e99224b78c4bcb1cfb4
Tests: style and rearrangements in geo tests.

diff --git a/geo.t b/geo.t
--- a/geo.t
+++ b/geo.t
@@ -36,36 +36,35 @@ http {
     %%TEST_GLOBALS_HTTP%%
 
     geo $geo {
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
-        0.0.0.0/0    world;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
+        0.0.0.0/0     world;
     }
 
     geo $arg_ip $geo_from_arg {
-        default      default;
-
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
+        default       default;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
     }
 
     geo $geo_proxy {
-        default      default;
-        proxy        127.0.0.1;
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
+        default       default;
+        proxy         127.0.0.1;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
     }
 
     geo $geo_proxy_recursive {
-        default      default;
-        proxy        127.0.0.1;
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
         proxy_recursive;
+        default       default;
+        proxy         127.0.0.1;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
     }
 
     geo $geo_ranges {
         ranges;
-        default      default;
+        default                    default;
         127.0.0.0-127.255.255.255  loopback;
         192.0.2.0-192.0.2.255      test;
     }
@@ -75,12 +74,12 @@ 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;
-            add_header X-XFR $geo_proxy_recursive;
-            add_header X-Ran $geo_ranges;
+            add_header X-IP   $remote_addr;
+            add_header X-Geo  $geo;
+            add_header X-Ran  $geo_ranges;
+            add_header X-Arg  $geo_from_arg;
+            add_header X-XFF  $geo_proxy;
+            add_header X-XFR  $geo_proxy_recursive;
         }
     }
 }
@@ -97,7 +96,9 @@ plan(skip_all => 'no 127.0.0.1 on host')
 
 ###############################################################################
 
-like(http_get('/1'), qr/^X-Geo: loopback/m, 'geo');
+my $r = http_get('/1');
+like($r, qr/^X-Geo: loopback/m, 'geo');
+like($r, qr/^X-Ran: loopback/m, 'geo ranges');
 
 like(http_get('/1?ip=192.0.2.1'), qr/^X-Arg: test/m, 'geo from variable');
 like(http_get('/1?ip=10.0.0.1'), qr/^X-Arg: default/m, 'geo default');
@@ -111,8 +112,6 @@ like(http_xff('192.0.2.1, 127.0.0.1'), q
 like(http_xff('192.0.2.1, 127.0.0.1'), qr/^X-XFR: test/m,
 	'geo proxy_recursive on');
 
-like(http_get('/1'), qr/^X-Ran: loopback/m, 'geo ranges');
-
 ###############################################################################
 
 sub http_xff {
diff --git a/stream_geo.t b/stream_geo.t
--- a/stream_geo.t
+++ b/stream_geo.t
@@ -37,14 +37,14 @@ events {
 
 stream {
     geo $geo {
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
-        0.0.0.0/0    world;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
+        0.0.0.0/0     world;
     }
 
     geo $remote_addr $geo_from_addr {
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
     }
 
     map $server_port $var {
@@ -53,20 +53,20 @@ stream {
     }
 
     geo $var $geo_from_var {
-        default      default;
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
+        default       default;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
     }
 
     geo $var $geo_world {
-        127.0.0.0/8  loopback;
-        192.0.2.0/24 test;
-        0.0.0.0/0    world;
+        127.0.0.0/8   loopback;
+        192.0.2.0/24  test;
+        0.0.0.0/0     world;
     }
 
     geo $geo_ranges {
         ranges;
-        default      default;
+        default                    default;
         127.0.0.0-127.255.255.255  loopback;
         192.0.2.0-192.0.2.255      test;
     }
@@ -74,9 +74,9 @@ stream {
     server {
         listen  127.0.0.1:8080;
         return  "geo:$geo
+                 geo_ranges:$geo_ranges
                  geo_from_addr:$geo_from_addr
-                 geo_from_var:$geo_from_var
-                 geo_ranges:$geo_ranges";
+                 geo_from_var:$geo_from_var";
     }
 
     server {
@@ -92,16 +92,16 @@ stream {
 
 EOF
 
-$t->try_run('no stream geo');
-$t->plan(6);
+$t->try_run('no stream geo')->plan(6);
 
 ###############################################################################
 
 my %data = stream()->read() =~ /(\w+):(\w+)/g;
 is($data{geo}, 'loopback', 'geo');
+is($data{geo_ranges}, 'loopback', 'geo ranges');
+
 is($data{geo_from_addr}, 'loopback', 'geo from addr');
 is($data{geo_from_var}, 'test', 'geo from var');
-is($data{geo_ranges}, 'loopback', 'geo ranges');
 
 is(stream('127.0.0.1:' . port(8081))->read(), 'default', 'geo default');
 is(stream('127.0.0.1:' . port(8082))->read(), 'world', 'geo world');