Mercurial > hg > nginx-tests

changeset 992:1beb641e21c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: fixed tests on win32 with stream return module. Avoid sending client data that stream return module doesn't read. This has a bad interaction on win32 where client may get a socket read error after it wrote data to the already closed socket.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 22 Jul 2016 16:50:17 +0300
parents 6246d69857cc
children 3ee5ca1ec728
files stream_proxy_complex.t stream_resolver.t
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/stream_proxy_complex.t
+++ b/stream_proxy_complex.t
@@ -68,12 +68,12 @@ EOF
 
 ###############################################################################
 
-is(stream('127.0.0.1:' . port(8081))->io('foo'), port(8091), 'upstream');
-is(stream('127.0.0.1:' . port(8081))->io('foo'), port(8091), 'upstream again');
+is(stream('127.0.0.1:' . port(8081))->read(), port(8091), 'upstream');
+is(stream('127.0.0.1:' . port(8081))->read(), port(8091), 'upstream again');
 
-is(stream('127.0.0.1:' . port(8082))->io('foo'), port(8092), 'upstream 2');
-is(stream('127.0.0.1:' . port(8082))->io('foo'), port(8093), 'upstream second');
+is(stream('127.0.0.1:' . port(8082))->read(), port(8092), 'upstream 2');
+is(stream('127.0.0.1:' . port(8082))->read(), port(8093), 'upstream second');
 
-is(stream('127.0.0.1:' . port(8083))->io('foo'), port(8093), 'implicit');
+is(stream('127.0.0.1:' . port(8083))->read(), port(8093), 'implicit');
 
 ###############################################################################
--- a/stream_resolver.t
+++ b/stream_resolver.t
@@ -92,13 +92,13 @@ EOF
 
 ###############################################################################
 
-ok(stream('127.0.0.1:' . port(8081))->io('.'), 'resolver');
-ok(!stream('127.0.0.1:' . port(8082))->io('.'), 'upstream no port');
-ok(!stream('127.0.0.1:' . port(8083))->io('.'), 'name not found');
+ok(stream('127.0.0.1:' . port(8081))->read(), 'resolver');
+ok(!stream('127.0.0.1:' . port(8082))->read(), 'upstream no port');
+ok(!stream('127.0.0.1:' . port(8083))->read(), 'name not found');
 
-ok(stream('127.0.0.1:' . port(8084))->io('.'), 'resolved tries');
-ok(!stream('127.0.0.1:' . port(8085))->io('.'), 'resolved tries limited');
-ok(stream('127.0.0.1:' . port(8086))->io('.'), 'resolved tries zero');
+ok(stream('127.0.0.1:' . port(8084))->read(), 'resolved tries');
+ok(!stream('127.0.0.1:' . port(8085))->read(), 'resolved tries limited');
+ok(stream('127.0.0.1:' . port(8086))->read(), 'resolved tries zero');
 
 $t->stop();