diff stream_geo.t @ 1012:a0758fe11465

Tests: style and rearrangements in geo tests.
author Andrey Zelenkov <zelenkov@nginx.com>
date Fri, 26 Aug 2016 16:30:54 +0300
parents 9b87810c75ca
children 8f92d97cf40e
line wrap: on
line diff
--- 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');