summaryrefslogtreecommitdiff
path: root/lib/custodian/protocol-tests/ftp.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
commite6a5fefac7c1078f05762b0c9aaa5f340fc0af5e (patch)
treeea4c7718d46e252d583dd37bdd0c502025ee8e27 /lib/custodian/protocol-tests/ftp.rb
parent6e7b07ad59c4596d6bb8189cd5fc735cbf652fa5 (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/ftp.rb')
-rwxr-xr-xlib/custodian/protocol-tests/ftp.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/custodian/protocol-tests/ftp.rb b/lib/custodian/protocol-tests/ftp.rb
index c528c84..a11abaf 100755
--- a/lib/custodian/protocol-tests/ftp.rb
+++ b/lib/custodian/protocol-tests/ftp.rb
@@ -74,7 +74,7 @@ class FTPTest
puts "FTP 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" => "ftp",
"test_port" => 21,
"verbose" => 1,
+ "timeout" => 4,
"test_alert" => "The FTP server no worky",
}