summaryrefslogtreecommitdiff
path: root/lib/custodian/protocoltest/http.rb
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2017-08-10 10:17:51 +0300
committerSteve Kemp <steve@steve.org.uk>2017-08-10 10:17:51 +0300
commit63e2d2f2ec87d833408b7e8b6fb33e3f0fa0c804 (patch)
tree18cd4b93e09a5c56f3e47d0fd2693372e51634a7 /lib/custodian/protocoltest/http.rb
parent005013d98d742989d3c000b04054e15bb0482a69 (diff)
Significant rubocop fixups.
This merge-request contains almost entirely mechanical changes, with a few exceptions: * I changed `do_ipv4` and `do_ipv6` to `ipv4` and `ipv6` respectively. * This fixed a warning about normal-casing. * I changed a test-case to compare against both `Integer` and `Fixnum` * Suspect this is a ruby-versionism. The tests continue to pass, so I believe this is safe to merge, but of course it is still not 100%: lib/custodian/queue.rb:135:21: W: Assignment in condition - you probably meant to use ==. added = true ^ lib/custodian/protocoltest/ssl.rb:218:5: W: Do not shadow rescued Exceptions rescue OpenSSL::SSL::SSLError => err ... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/custodian/protocoltest/ssl.rb:286:5: W: Do not shadow rescued Exceptions rescue OpenSSL::SSL::SSLError => err ... ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/custodian/protocoltest/http.rb:307:7: C: Assignment Branch Condition size for run_test is too high. [84.53/72] def run_test ^^^ lib/custodian/protocoltest/http.rb:307:7: C: Cyclomatic complexity for run_test is too high. [22/19] def run_test ^^^ lib/custodian/protocoltest/http.rb:307:7: C: Method has too many lines. [97/87] def run_test ... ^^^^^^^^^^^^ lib/custodian/protocoltest/http.rb:307:7: C: Perceived complexity for run_test is too high. [23/21] def run_test In short this takes care of _most_ of the warnings, but updates requiring significant code-change have not been applied.
Diffstat (limited to 'lib/custodian/protocoltest/http.rb')
-rw-r--r--lib/custodian/protocoltest/http.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/custodian/protocoltest/http.rb b/lib/custodian/protocoltest/http.rb
index 0bf1a68..084e9aa 100644
--- a/lib/custodian/protocoltest/http.rb
+++ b/lib/custodian/protocoltest/http.rb
@@ -59,7 +59,7 @@ module Custodian
# raise an alert, but if it is this false-error then we
# will silently disable this test-run.
#
- def ignore_failure?( protocol )
+ def ignore_failure?(protocol)
# Get the hostname we're connecting to.
u = URI.parse(@url)
@@ -116,7 +116,7 @@ module Custodian
#
# "ips" being empty because the DNS failure was genuine
#
- return ( ! ips.empty? )
+ return (!ips.empty?)
end
@@ -189,8 +189,8 @@ module Custodian
#
# Save username/password if they were specified
#
- @username = u.user if ( u.user )
- @password = u.password if ( u.password )
+ @username = u.user if (u.user)
+ @password = u.password if (u.password)
#
# Expected status
@@ -278,7 +278,7 @@ module Custodian
# Do we have basic auth?
#
def basic_auth?
- ( @username.nil? == false ) && ( @password.nil? == false )
+ (@username.nil? == false) && (@password.nil? == false)
end
#
@@ -341,7 +341,7 @@ module Custodian
# If we're running with HTTP-basic-auth we should remove
# the username/password from the URL we're passing to curb.
#
- if ( basic_auth? )
+ if (basic_auth?)
u = URI.parse(test_url)
u.user = nil
u.password = nil
@@ -365,7 +365,7 @@ module Custodian
#
# Should we use HTTP basic-auth?
#
- if basic_auth?
+ if basic_auth?
c.http_auth_types = :basic
c.username = basic_auth_username
c.password = basic_auth_password
@@ -421,7 +421,7 @@ module Custodian
rescue Curl::Err::TooManyRedirectsError
errors << "#{protocol_msg}: More than 10 redirections."
rescue Curl::Err::HostResolutionError => x
- resolution_errors << "#{protocol_msg}: #{x.class}: #{x.message}\n #{x.backtrace.join("\n ")}." unless ignore_failure?( resolve_mode)
+ resolution_errors << "#{protocol_msg}: #{x.class}: #{x.message}\n #{x.backtrace.join("\n ")}." unless ignore_failure?(resolve_mode)
rescue => x
errors << "#{protocol_msg}: #{x.class}: #{x.message}\n #{x.backtrace.join("\n ")}."