Mercurial > hg > nginx-tests

changeset 565:ff49e1c00b35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: in stream tests, try to read all the data where appropriate.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 29 Apr 2015 14:58:27 +0300
parents a1c93746570d
children 4296379213c8
files stream_error_log.t stream_proxy_next_upstream.t stream_upstream.t stream_upstream_least_conn.t
diffstat 4 files changed, 20 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/stream_error_log.t
+++ b/stream_error_log.t
@@ -170,10 +170,12 @@ sub stream_get {
 	$peer = '127.0.0.1:8080' unless defined $peer;
 	my $s = stream_connect($peer);
 	stream_write($s, $data);
-	my $r = stream_read($s);
 
-	$s->close;
-	return $r;
+	$data = '';
+	while (my $buf = stream_read($s)) {
+		$data .= $buf;
+	}
+	return $data;
 }
 
 sub stream_connect {
--- a/stream_proxy_next_upstream.t
+++ b/stream_proxy_next_upstream.t
@@ -85,10 +85,12 @@ sub stream_get {
 
 	my $s = stream_connect($peer);
 	stream_write($s, $data);
-	my $r = stream_read($s);
 
-	$s->close;
-	return $r;
+	$data = '';
+	while (my $buf = stream_read($s)) {
+		$data .= $buf;
+	}
+	return $data;
 }
 
 sub stream_connect {
--- a/stream_upstream.t
+++ b/stream_upstream.t
@@ -119,10 +119,12 @@ sub stream_get {
 
 	my $s = stream_connect($peer);
 	stream_write($s, $data);
-	my $r = stream_read($s);
 
-	$s->close;
-	return $r;
+	$data = '';
+	while (my $buf = stream_read($s)) {
+		$data .= $buf;
+	}
+	return $data;
 }
 
 sub stream_connect {
--- a/stream_upstream_least_conn.t
+++ b/stream_upstream_least_conn.t
@@ -109,10 +109,12 @@ sub stream_get {
 
 	my $s = stream_connect($peer);
 	stream_write($s, $data);
-	my $r = stream_read($s);
 
-	$s->close;
-	return $r;
+	$data = '';
+	while (my $buf = stream_read($s)) {
+		$data .= $buf;
+	}
+	return $data;
 }
 
 sub stream_connect {