summaryrefslogtreecommitdiff
path: root/lib/custodian/protocol-tests/ssh.rb
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-14 16:05:03 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-14 16:05:03 +0000
commitdff1f98662289589ca6227bffa885f90b5773e62 (patch)
treeea4c7718d46e252d583dd37bdd0c502025ee8e27 /lib/custodian/protocol-tests/ssh.rb
parente880c1890738793d176c6d07e35666116fc34514 (diff)
Updated each test to use the timeout period specified in the JSON
hash. Update the trivial test to set such a thing too.
Diffstat (limited to 'lib/custodian/protocol-tests/ssh.rb')
-rwxr-xr-xlib/custodian/protocol-tests/ssh.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/custodian/protocol-tests/ssh.rb b/lib/custodian/protocol-tests/ssh.rb
index b563aad..870be32 100755
--- a/lib/custodian/protocol-tests/ssh.rb
+++ b/lib/custodian/protocol-tests/ssh.rb
@@ -73,7 +73,7 @@ class SSHTest
puts "ssh testing host #{host}:#{port}" if ( @test_data['verbose'] )
begin
- timeout(3) do
+ timeout(@test_data["timeout"]) do
begin
socket = TCPSocket.new( host, port )
@@ -130,6 +130,7 @@ if __FILE__ == $0 then
"test_type" => "ssh",
"test_port" => 2222,
"verbose" => 1,
+ "timeout" => 5,
"test_alert" => "Steve's host isn't running SSH?",
}