Mercurial > hg > nginx-tests

comparison stream_geo.t @ 1251:766bcbb632ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: removed TODO and try_run() checks for legacy versions.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 24 Nov 2017 19:58:40 +0300
parents 3fc6817cd84a
children f3ba4c74de31
comparison
equal deleted inserted replaced
1250:b708848eb49a 1251:766bcbb632ee
217 EOF 217 EOF
218 218
219 $t->write_file('geo.conf', '127.0.0.0/8 loopback;'); 219 $t->write_file('geo.conf', '127.0.0.0/8 loopback;');
220 $t->write_file('geo-ranges.conf', '127.0.0.0-127.255.255.255 loopback;'); 220 $t->write_file('geo-ranges.conf', '127.0.0.0-127.255.255.255 loopback;');
221 221
222 $t->try_run('no stream geo')->plan(19); 222 $t->run()->plan(19);
223 223
224 ############################################################################### 224 ###############################################################################
225 225
226 my %data = stream('127.0.0.1:' . port(8080))->read() =~ /(\w+):(\w+)/g; 226 my %data = stream('127.0.0.1:' . port(8080))->read() =~ /(\w+):(\w+)/g;
227 is($data{geo}, 'loopback', 'geo'); 227 is($data{geo}, 'loopback', 'geo');
228 is($data{geo_include}, 'loopback', 'geo include'); 228 is($data{geo_include}, 'loopback', 'geo include');
229 is($data{geo_delete}, 'world', 'geo delete'); 229 is($data{geo_delete}, 'world', 'geo delete');
230 is($data{geo_ranges}, 'loopback', 'geo ranges'); 230 is($data{geo_ranges}, 'loopback', 'geo ranges');
231 is($data{geo_ranges_include}, 'loopback', 'geo ranges include'); 231 is($data{geo_ranges_include}, 'loopback', 'geo ranges include');
232 232
233 TODO: {
234 todo_skip 'use-after-free', 2 unless $ENV{TEST_NGINX_UNSAFE}
235 or $t->has_version('1.11.4');
236
237 is(stream('127.0.0.1:' . port(8083))->read(), 'default', 'geo ranges delete'); 233 is(stream('127.0.0.1:' . port(8083))->read(), 'default', 'geo ranges delete');
238 is(stream('127.0.0.1:' . port(8084))->read(), 'default', 'geo ranges delete 2'); 234 is(stream('127.0.0.1:' . port(8084))->read(), 'default', 'geo ranges delete 2');
239
240 }
241 235
242 is($data{geo_before}, 'loopback', 'geo ranges add before'); 236 is($data{geo_before}, 'loopback', 'geo ranges add before');
243 is($data{geo_after}, 'loopback', 'geo ranges add after'); 237 is($data{geo_after}, 'loopback', 'geo ranges add after');
244 is($data{geo_insert}, 'loopback', 'geo ranges insert'); 238 is($data{geo_insert}, 'loopback', 'geo ranges insert');
245 is($data{geo_insert_before}, 'loopback', 'geo ranges insert before'); 239 is($data{geo_insert_before}, 'loopback', 'geo ranges insert before');
246 is($data{geo_insert_after}, 'loopback', 'geo ranges insert after'); 240 is($data{geo_insert_after}, 'loopback', 'geo ranges insert after');
247 241
248 is($data{geo_from_addr}, 'loopback', 'geo from addr'); 242 is($data{geo_from_addr}, 'loopback', 'geo from addr');
249 is($data{geo_from_var}, 'test', 'geo from var'); 243 is($data{geo_from_var}, 'test', 'geo from var');
250 244
251 TODO: {
252 todo_skip 'use-after-free', 1 unless $ENV{TEST_NGINX_UNSAFE}
253 or $t->has_version('1.11.4');
254
255 is(stream('127.0.0.1:' . port(8085))->read(), 'default', 245 is(stream('127.0.0.1:' . port(8085))->read(), 'default',
256 'geo delete range from variable'); 246 'geo delete range from variable');
257
258 }
259 247
260 is(stream('127.0.0.1:' . port(8081))->read(), 'default', 'geo default'); 248 is(stream('127.0.0.1:' . port(8081))->read(), 'default', 'geo default');
261 is(stream('127.0.0.1:' . port(8082))->read(), 'world', 'geo world'); 249 is(stream('127.0.0.1:' . port(8082))->read(), 'world', 'geo world');
262 is(stream('127.0.0.1:' . port(8086))->read(), 'default', 'geo ranges default'); 250 is(stream('127.0.0.1:' . port(8086))->read(), 'default', 'geo ranges default');
263 is(stream('127.0.0.1:' . port(8087))->read(), 'foo2', 'geo ranges add'); 251 is(stream('127.0.0.1:' . port(8087))->read(), 'foo2', 'geo ranges add');