From 582014089a6daa096ed66be6ecb680cbe13a0354 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Wed, 14 Nov 2012 08:27:59 +0000
Subject:   Be more consistent about failures.

---
 lib/custodian/protocol-tests/http.rb  | 3 ++-
 lib/custodian/protocol-tests/https.rb | 3 ++-
 lib/custodian/protocol-tests/ping.rb  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/custodian')

diff --git a/lib/custodian/protocol-tests/http.rb b/lib/custodian/protocol-tests/http.rb
index 3f2ec8d..67defca 100755
--- a/lib/custodian/protocol-tests/http.rb
+++ b/lib/custodian/protocol-tests/http.rb
@@ -155,9 +155,10 @@ class HTTPTest
       @error = "Connection refused"
       return false
     rescue => ex
-      raise ex
+      @error = ex
       return false
     end
+    @error = "Misc failure"
     return false
   end
 
diff --git a/lib/custodian/protocol-tests/https.rb b/lib/custodian/protocol-tests/https.rb
index 8b9c805..642908f 100755
--- a/lib/custodian/protocol-tests/https.rb
+++ b/lib/custodian/protocol-tests/https.rb
@@ -156,9 +156,10 @@ class HTTPSTest
       @error = "Connection refused"
       return false
     rescue => ex
-      raise ex
+      @error = ex
       return false
     end
+    @error = "Misc failure"
     return false
   end
 
diff --git a/lib/custodian/protocol-tests/ping.rb b/lib/custodian/protocol-tests/ping.rb
index f99de3b..fd5a4ef 100755
--- a/lib/custodian/protocol-tests/ping.rb
+++ b/lib/custodian/protocol-tests/ping.rb
@@ -73,7 +73,7 @@ class PINGTest
 
     if ( system( "#{binary} #{host}" ) == true )
       puts "PING OK" if ( @test_data['verbose'] )
-      return  true
+      return true
     else
       @error = "Ping failed.  TODO: Mtr"
       return false
-- 
cgit v1.2.1