Bug 6466 - hung socket read causes SIP tests to fail
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
parent
cb1a946693
commit
b0a4233366
1 changed files with 8 additions and 4 deletions
|
@ -185,10 +185,14 @@ sub one_msg {
|
||||||
|
|
||||||
# If reading or writing fails, then the server's dead,
|
# If reading or writing fails, then the server's dead,
|
||||||
# so there's no point in continuing.
|
# so there's no point in continuing.
|
||||||
if (!write_msg({seqno => $seqno}, $test->{msg}, $sock)) {
|
if ( !write_msg( { seqno => $seqno }, $test->{msg}, $sock ) ) {
|
||||||
BAIL_OUT("Write failure in $test->{id}");
|
BAIL_OUT("Write failure in $test->{id}");
|
||||||
} elsif (!($resp = <$sock>)) {
|
}
|
||||||
BAIL_OUT("Read failure in $test->{id}");
|
|
||||||
|
my $rv = sysread( $sock, $resp, 10000000 ); # 10000000 is a big number
|
||||||
|
|
||||||
|
if ( !$rv ) {
|
||||||
|
BAIL_OUT("Read failure in $test->{id}");
|
||||||
}
|
}
|
||||||
|
|
||||||
chomp($resp);
|
chomp($resp);
|
||||||
|
|
Loading…
Reference in a new issue