From dff1f98662289589ca6227bffa885f90b5773e62 Mon Sep 17 00:00:00 2001
From: Steve Kemp <steve@steve.org.uk>
Date: Wed, 14 Nov 2012 16:05:03 +0000
Subject:   Updated each test to use the timeout period specified in the JSON  
 hash.  Update the trivial test to set such a thing too.

---
 lib/custodian/protocol-tests/smtp.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/custodian/protocol-tests/smtp.rb')

diff --git a/lib/custodian/protocol-tests/smtp.rb b/lib/custodian/protocol-tests/smtp.rb
index 8ed19e8..340821c 100755
--- a/lib/custodian/protocol-tests/smtp.rb
+++ b/lib/custodian/protocol-tests/smtp.rb
@@ -74,7 +74,7 @@ class SMTPTest
     puts "SMTP testing host #{host}:#{port}" if ( @test_data['verbose'] )
 
     begin
-      timeout(3) do
+      timeout(@test_data["timeout"]) do
 
         begin
           socket = TCPSocket.new( host, port )
@@ -129,7 +129,9 @@ if __FILE__ == $0 then
   test = {
     "target_host" => "mail.steve.org.uk",
     "test_type"   => "smtp",
+    "test_port"   => "25",
     "verbose"     => 1,
+    "timeout"     => 5,
     "test_alert"  => "SMTP failure",
   }
 
-- 
cgit v1.2.1