diff options
author | Steve Kemp <steve@steve.org.uk> | 2017-08-10 10:17:51 +0300 |
---|---|---|
committer | Steve Kemp <steve@steve.org.uk> | 2017-08-10 10:17:51 +0300 |
commit | 63e2d2f2ec87d833408b7e8b6fb33e3f0fa0c804 (patch) | |
tree | 18cd4b93e09a5c56f3e47d0fd2693372e51634a7 /t/test-custodian-parser.rb | |
parent | 005013d98d742989d3c000b04054e15bb0482a69 (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 't/test-custodian-parser.rb')
-rwxr-xr-x | t/test-custodian-parser.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/test-custodian-parser.rb b/t/test-custodian-parser.rb index 2239503..62a39dc 100755 --- a/t/test-custodian-parser.rb +++ b/t/test-custodian-parser.rb @@ -438,15 +438,15 @@ EOF # test data # data = { - 'http://bob:steve@example must run http.' => - { username: 'bob', password: 'steve'}, + 'http://bob:steve@example must run http.' => + { :username => 'bob', :password => 'steve' }, 'http://stee\':steve@example must run http.' => - { username: 'stee\'', password: 'steve'}, + { :username => 'stee\'', :password => 'steve' }, 'http://e\'e:pa$$w0rd@example must run http.' => - { username: 'e\'e', password: 'pa$$w0rd'}, + { :username => 'e\'e', :password => 'pa$$w0rd' } } - data.each do |str, hash | + data.each do |str, hash| assert_nothing_raised do # @@ -461,8 +461,8 @@ EOF # There should be auth-enabled assert(obj[0].basic_auth?) - assert(obj[0].basic_auth_username == hash[:username] ) - assert(obj[0].basic_auth_password == hash[:password] ) + assert(obj[0].basic_auth_username == hash[:username]) + assert(obj[0].basic_auth_password == hash[:password]) end end @@ -488,7 +488,7 @@ EOF # # Test the parser with this text # - expiries.each do |str,days| + expiries.each do |str, days| assert_nothing_raised do # @@ -505,13 +505,13 @@ EOF # Test both of them to make sure we got our expiry period. obj.each do |x| - if ( x.class.name =~ /SSL/ ) - found_days = x.expiry_days + if (x.class.name =~ /SSL/) + found_days = x.expiry_days end end # Ensure we did find a match. - assert(found_days != -1 ) + assert(found_days != -1) assert(found_days == days) end |