# HG changeset patch # User Sergey Kandaurov # Date 1469195417 -10800 # Node ID 1beb641e21c972a3dc192d9c7683bd651e31b752 # Parent 6246d69857cc37af053c0ccd898ec01f8900b548 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. diff --git a/stream_proxy_complex.t b/stream_proxy_complex.t --- 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'); ############################################################################### diff --git a/stream_resolver.t b/stream_resolver.t --- 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();