summaryrefslogtreecommitdiff
path: root/worker/tests
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-13 11:15:51 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-13 11:15:51 +0000
commitb02dab529ccf63bd61db2cc802bdbc4d65648ae8 (patch)
treebb9cfd21de438844e50f4bae71f3c49564ebd98d /worker/tests
parentc1ea9ce5c169193e254844448c4c83acf308314e (diff)
Updated to use the new class-based API
Diffstat (limited to 'worker/tests')
-rwxr-xr-xworker/tests/ftp.rb12
-rwxr-xr-xworker/tests/http.rb32
-rwxr-xr-xworker/tests/https.rb34
3 files changed, 39 insertions, 39 deletions
diff --git a/worker/tests/ftp.rb b/worker/tests/ftp.rb
index c856c00..a25fe27 100755
--- a/worker/tests/ftp.rb
+++ b/worker/tests/ftp.rb
@@ -45,8 +45,8 @@ class FTPTest
#
# Get the hostname & port to test against.
#
- host = @test_data[:target_host]
- port = @test_data[:test_port]
+ host = @test_data["target_host"]
+ port = @test_data["test_port"]
puts "FTP testing host #{host}:#{port}"
@@ -103,10 +103,10 @@ if __FILE__ == $0 then
# Sample data.
#
test = {
- :target_host => "mirror.bytemark.co.uk",
- :test_type => "ftp",
- :test_port => 21,
- :test_alert => "The FTP server no worky",
+ "target_host" => "mirror.bytemark.co.uk",
+ "test_type" => "ftp",
+ "test_port" => 21,
+ "test_alert" => "The FTP server no worky",
}
diff --git a/worker/tests/http.rb b/worker/tests/http.rb
index 4f2cf0b..eaa351f 100755
--- a/worker/tests/http.rb
+++ b/worker/tests/http.rb
@@ -46,7 +46,7 @@ class HTTPTest
#
# Ensure we had a URL
#
- if ( @test_data[:target_host].nil? )
+ if ( @test_data["target_host"].nil? )
@error = "Missing URL for the test"
return false
end
@@ -56,27 +56,27 @@ class HTTPTest
# Do the fetch, if this success then we'll have the
# @status + @text setup
#
- if ( getURL (@test_data[:target_host] ) )
+ if ( getURL (@test_data["target_host"] ) )
#
# Do we need to test for a HTTP status code?
#
- if ( @test_data[:http_status] )
- puts "Testing for HTTP status code: #{@test_data[:http_status]}"
+ if ( @test_data["http_status"] )
+ puts "Testing for HTTP status code: #{@test_data['http_status']}"
- if ( @status != @test_data[:http_status].to_i)
- @error = "#{@error} status code was #{@status} not #{@test_data[:http_status]}"
+ if ( @status != @test_data['http_status'].to_i)
+ @error = "#{@error} status code was #{@status} not #{@test_data['http_status']}"
end
end
#
# Do we need to search for text in the body of the reply?
#
- if ( @test_data[:http_text] )
- puts "Testing for text in the response: #{@test_data[:http_text]}"
+ if ( @test_data['http_text'] )
+ puts "Testing for text in the response: #{@test_data['http_text']}"
- if (! @body.match(/#{@test_data[:http_text]}/i) )
- @error = "#{@error} The respond did not contain #{test_data[:http_text]}"
+ if (! @body.match(/#{@test_data['http_text']}/i) )
+ @error = "#{@error} The respond did not contain #{test_data['http_text']}"
end
end
@@ -154,12 +154,12 @@ if __FILE__ == $0 then
# Sample data.
#
test = {
- :target_host => "http://www.steve.org.uk/",
- :test_type => "http",
- :test_port => 80,
- :test_alert => "Steve's website is unavailable",
- :http_text => "Steve Kemp",
- :http_status => "200"
+ "target_host" => "http://www.steve.org.uk/",
+ "test_type" => "http",
+ "test_port" => 80,
+ "test_alert" => "Steve's website is unavailable",
+ "http_text" => "Steve Kemp",
+ "http_status" => "200"
}
diff --git a/worker/tests/https.rb b/worker/tests/https.rb
index 2575a35..8aff360 100755
--- a/worker/tests/https.rb
+++ b/worker/tests/https.rb
@@ -46,7 +46,7 @@ class HTTPSTest
#
# Ensure we had a URL
#
- if ( @test_data[:target_host].nil? )
+ if ( @test_data["target_host"].nil? )
@error = "Missing URL for the test"
return false
end
@@ -56,27 +56,27 @@ class HTTPSTest
# Do the fetch, if this success then we'll have the
# @status + @text setup
#
- if ( getURL (@test_data[:target_host] ) )
+ if ( getURL (@test_data["target_host"] ) )
#
# Do we need to test for a HTTP status code?
#
- if ( @test_data[:http_status] )
- puts "Testing for HTTP status code: #{@test_data[:http_status]}"
+ if ( @test_data["http_status"] )
+ puts "Testing for HTTP status code: #{@test_data['http_status']}"
- if ( @status != @test_data[:http_status].to_i)
- @error = "#{@error} status code was #{@status} not #{@test_data[:http_status]}"
+ if ( @status != @test_data['http_status'].to_i)
+ @error = "#{@error} status code was #{@status} not #{@test_data['http_status']}"
end
end
#
# Do we need to search for text in the body of the reply?
#
- if ( @test_data[:http_text] )
- puts "Testing for text in the response: #{@test_data[:http_text]}"
+ if ( @test_data['http_text'] )
+ puts "Testing for text in the response: #{@test_data['http_text']}"
- if (! @body.match(/#{@test_data[:http_text]}/i) )
- @error = "#{@error} The respond did not contain #{test_data[:http_text]}"
+ if (! @body.match(/#{@test_data['http_text']}/i) )
+ @error = "#{@error} The respond did not contain #{test_data['http_text']}"
end
end
@@ -154,19 +154,19 @@ if __FILE__ == $0 then
# Sample data.
#
test = {
- :target_host => "http://www.steve.org.uk/",
- :test_type => "http",
- :test_port => 80,
- :test_alert => "Steve's website is unavailable",
- :http_text => "Steve Kemp",
- :http_status => "200"
+ "target_host" => "http://www.steve.org.uk/",
+ "test_type" => "http",
+ "test_port" => 80,
+ "test_alert" => "Steve's website is unavailable",
+ "http_text" => "Steve Kemp",
+ "http_status" => "200"
}
#
# Run the test.
#
- http = HTTPTest.new( test )
+ http = HTTPSTest.new( test )
if ( http.run_test )
puts "TEST OK"
else