[Koha-patches] [PATCH] Bug 6466 - hung socket read causes SIP tests to fail
James, Mason
mtj at kohaaloha.com
Mon Jun 6 06:30:11 CEST 2011
From: JAMES Mason <mason at kohaaloha.com>
---
C4/SIP/t/SIPtest.pm | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/C4/SIP/t/SIPtest.pm b/C4/SIP/t/SIPtest.pm
index 62d5646..ed11f8e 100644
--- a/C4/SIP/t/SIPtest.pm
+++ b/C4/SIP/t/SIPtest.pm
@@ -185,10 +185,14 @@ sub one_msg {
# If reading or writing fails, then the server's dead,
# so there's no point in continuing.
- if (!write_msg({seqno => $seqno}, $test->{msg}, $sock)) {
- BAIL_OUT("Write failure in $test->{id}");
- } elsif (!($resp = <$sock>)) {
- BAIL_OUT("Read failure in $test->{id}");
+ if ( !write_msg( { seqno => $seqno }, $test->{msg}, $sock ) ) {
+ BAIL_OUT("Write 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);
--
1.7.1
More information about the Koha-patches
mailing list