From: Mike Taylor <mike@miketaylor.org.uk>
Date: Tue, 8 Jun 2010 14:13:46 +0000 (+0100)
Subject: Recognise TIMEOUT errors as well as CONNECT errors in the attempt to connect to no... 
X-Git-Tag: CPAN_1_26~9
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=14fadf61b05c6f5684a667eb07ce9b3e2cf6708c;p=ZOOM-Perl-moved-to-github.git

Recognise TIMEOUT errors as well as CONNECT errors in the attempt to connect to no.such.host -- fixes Red hat problem with test suite
---

diff --git a/t/1-Net-Z3950-ZOOM.t b/t/1-Net-Z3950-ZOOM.t
index 74e3990..27c479e 100644
--- a/t/1-Net-Z3950-ZOOM.t
+++ b/t/1-Net-Z3950-ZOOM.t
@@ -19,8 +19,10 @@ my($errcode, $errmsg, $addinfo) = (undef, "dummy", "dummy");
 my $host = "no.such.host";
 my $conn = Net::Z3950::ZOOM::connection_new($host, 0);
 $errcode = Net::Z3950::ZOOM::connection_error($conn, $errmsg, $addinfo);
-ok($errcode == Net::Z3950::ZOOM::ERROR_CONNECT && $addinfo eq $host,
-   "connection to non-existent host '$host' fails: \$conn=$conn, errcode=$errcode, addinfo=$addinfo");
+# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT
+ok(($errcode == Net::Z3950::ZOOM::ERROR_CONNECT ||
+    $errcode == Net::Z3950::ZOOM::ERROR_TIMEOUT) && $addinfo eq $host,
+   "connection to non-existent host '$host' fails: errcode=$errcode, addinfo=$addinfo");
 
 $host = "z3950.indexdata.com/gils";
 $conn = Net::Z3950::ZOOM::connection_new($host, 0);
diff --git a/t/2-ZOOM.t b/t/2-ZOOM.t
index e369e39..aaf867d 100644
--- a/t/2-ZOOM.t
+++ b/t/2-ZOOM.t
@@ -17,9 +17,11 @@ ok($msg eq "Empty term unsupported", "SRW diagnostic string lookup works");
 my $host = "no.such.host";
 my $conn;
 eval { $conn = new ZOOM::Connection($host, 0) };
+# For some reason, Red Hat signals this as a TIMEOUT rather than a CONNECT
 ok($@ && $@->isa("ZOOM::Exception") &&
-   $@->code() == ZOOM::Error::CONNECT && $@->addinfo() eq $host,
-   "connection to non-existent host '$host' fails: \$conn=$conn, \$\@=$@");
+   ($@->code() == ZOOM::Error::CONNECT ||
+    $@->code() == ZOOM::Error::TIMEOUT) && $@->addinfo() eq $host,
+   "connection to non-existent host '$host' fails: \$\@=$@");
 
 $host = "z3950.indexdata.com/gils";
 eval { $conn = new ZOOM::Connection($host, 0) };