# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1366065831 0
# Node ID c754b1c79efeefa3ecbd27ae8197ec76affacdf0
# Parent  b6f0537afa01a24e3d20a90a6251a67d23ccb5ca
Tests: better timeout handling in proxy_upgrade.t.

Now it uses nonblocking IO instead of eval + alarm model, and properly
handles write timeouts as well as read ones.

diff --git a/proxy_upgrade.t b/proxy_upgrade.t
--- a/proxy_upgrade.t
+++ b/proxy_upgrade.t
@@ -147,7 +147,7 @@ sub upgrade_connect {
 	local $SIG{PIPE} = 'IGNORE';
 
 	log_out($buf);
-	$s->print($buf);
+	$s->syswrite($buf);
 
 	# read response
 
@@ -174,27 +174,48 @@ sub upgrade_connect {
 
 sub upgrade_getline {
 	my ($s) = @_;
-	my $buf;
+	my ($h, $buf, $line);
 
-	eval {
-		local $SIG{ALRM} = sub { die "timeout\n"; };
-		alarm(2);
-		$buf = $s->getline();
-		alarm(0);
-	};
-	alarm(0);
+	${*$s}->{_upgrade_private} ||= { b => ''};
+	$h = ${*$s}->{_upgrade_private};
 
-	if ($@) {
-		log_in("died: $@");
-		return undef;
+	if ($h->{b} =~ /^(.*?\x0a)(.*)/ms) {
+		$h->{b} = $2;
+		return $1;
 	}
 
-	return $buf;
+	$s->blocking(0);
+	while (IO::Select->new($s)->can_read(1.5)) {
+		my $n = $s->sysread($buf, 1024);
+		last unless $n;
+
+		$h->{b} .= $buf;
+
+		if ($h->{b} =~ /^(.*?\x0a)(.*)/ms) {
+			$h->{b} = $2;
+			return $1;
+		}
+	};
 }
 
 sub upgrade_write {
 	my ($s, $message) = @_;
-	$s->print($message . CRLF);
+
+	$message = $message . CRLF;
+
+	local $SIG{PIPE} = 'IGNORE';
+
+	$s->blocking(0);
+	while (IO::Select->new($s)->can_write(1.5)) {
+		my $n = $s->syswrite($message);
+		last unless $n;
+		$message = substr($message, $n);
+		last unless length $message;
+	}
+
+	if (length $message) {
+		$s->close();
+	}
 }
 
 sub upgrade_read {