Mercurial > hg > nginx-tests

diff stream_geo.t @ 1044:1fe8d33f75ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: split out geo tests with binary base and skip by default. These tests require configuration with a large number of geo entries, which may cause long configuration parsing and enrage waitforfile().
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 30 Sep 2016 20:31:09 +0300
parents 2cf72e8a1a6b
children 3fc6817cd84a
line wrap: on
line diff
--- a/stream_geo.t
+++ b/stream_geo.t
@@ -162,16 +162,6 @@ stream {
         127.0.0.1-127.0.0.255  loopback;
      }
 
-    geo $geo_base_create {
-        ranges;
-        include  base.conf;
-    }
-
-    geo $geo_base_include {
-        ranges;
-        include  base.conf;
-    }
-
     server {
         listen  127.0.0.1:8080;
         return  "geo:$geo
@@ -184,8 +174,6 @@ stream {
                  geo_insert:$geo_insert
                  geo_insert_before:$geo_insert_before
                  geo_insert_after:$geo_insert_after
-                 geo_base_create:$geo_base_create
-                 geo_base_include:$geo_base_include
                  geo_from_addr:$geo_from_addr
                  geo_from_var:$geo_from_var";
     }
@@ -230,12 +218,8 @@ EOF
 
 $t->write_file('geo.conf', '127.0.0.0/8  loopback;');
 $t->write_file('geo-ranges.conf', '127.0.0.0-127.255.255.255  loopback;');
-$t->write_file('base.conf', join('', map {
-	"127." . $_/256/256 % 256 . "." . $_/256 % 256 . "." . $_ % 256 .
-	"-127." . $_/256/256 % 256 . "." . $_/256 % 256 . "." .$_ % 256 . " " .
-	($_ == 1 ? "loopback" : "range$_") . ";" } (0 .. 100000)));
 
-$t->try_run('no stream geo')->plan(21);
+$t->try_run('no stream geo')->plan(19);
 
 ###############################################################################
 
@@ -260,8 +244,6 @@ is($data{geo_after}, 'loopback', 'geo ra
 is($data{geo_insert}, 'loopback', 'geo ranges insert');
 is($data{geo_insert_before}, 'loopback', 'geo ranges insert before');
 is($data{geo_insert_after}, 'loopback', 'geo ranges insert after');
-is($data{geo_base_create}, 'loopback', 'geo binary base create');
-is($data{geo_base_include}, 'loopback', 'geo binary base include');
 
 is($data{geo_from_addr}, 'loopback', 'geo from addr');
 is($data{geo_from_var}, 'test', 'geo from var');