summaryrefslogtreecommitdiff
path: root/lib/custodian/protocoltest/openproxy.rb
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2015-04-16 16:14:06 +0100
committerSteve Kemp <steve@steve.org.uk>2015-04-16 16:14:06 +0100
commitc31a047c7ecf949b3cf8369985946f563957bf0a (patch)
treedaa4a5bc7db319540d31c873a32f7c58b411f8b3 /lib/custodian/protocoltest/openproxy.rb
parent3d15acf163a514816f3d2e2d08730dfb708fe5fd (diff)
Updated test-handler for new API.
This update consists of two changes: * No longer return "true" or "false" instead return "TEST_FAILED", or "TEST_SUCCEEDED". * Removed the testing of test-inversion from the class, now it lives in the base-class where it should have done all along.
Diffstat (limited to 'lib/custodian/protocoltest/openproxy.rb')
-rw-r--r--lib/custodian/protocoltest/openproxy.rb21
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/custodian/protocoltest/openproxy.rb b/lib/custodian/protocoltest/openproxy.rb
index 07f608f..d3acfaa 100644
--- a/lib/custodian/protocoltest/openproxy.rb
+++ b/lib/custodian/protocoltest/openproxy.rb
@@ -1,5 +1,6 @@
-
require 'custodian/settings'
+require 'custodian/testfactory'
+
require 'uri'
@@ -41,14 +42,6 @@ module Custodian
#
@host = line.split(/\s+/)[0]
- #
- # Is this test inverted?
- #
- if line =~ /must\s+not\s+run\s+/
- @inverted = true
- else
- @inverted = false
- end
end
@@ -112,9 +105,9 @@ module Custodian
return false
end
end
- rescue Timeout::Error => e
+ rescue Timeout::Error => _e
@error = 'Timed out during fetch.'
- return false
+ return Custodian::TestResult::TEST_FAILED
end
#
@@ -122,10 +115,10 @@ module Custodian
# got a result.
#
if (@status.to_i == 200)
- return true
+ return Custodian::TestResult::TEST_PASSED
else
- @error = "Proxy fetch of http://google.com/ via #{@host} failed"
- return false
+ @error = "Proxy fetch of http://google.com/ via #{@host} failed"
+ return Custodian::TestResult::TEST_FAILED
end
end