summaryrefslogtreecommitdiff
path: root/t/test-custodian-settings.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 /t/test-custodian-settings.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 't/test-custodian-settings.rb')
-rwxr-xr-xt/test-custodian-settings.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/t/test-custodian-settings.rb b/t/test-custodian-settings.rb
index 74f881b..1630859 100755
--- a/t/test-custodian-settings.rb
+++ b/t/test-custodian-settings.rb
@@ -47,36 +47,37 @@ class TestConfigurationSingleton < Test::Unit::TestCase
# retry delay - probably unset.
a = settings.retry_delay
- assert(a.class == Fixnum)
+ assert(a.class == Integer ||
+ a.class == Fixnum)
# store a number
settings._store('retry_delay', 5)
a = settings.retry_delay
- assert(a.class == Fixnum)
+ assert(a.class == Integer || a.class == Fixnum )
assert(a == 5)
# store a string
settings._store('retry_delay', '35')
a = settings.retry_delay
- assert(a.class == Fixnum)
+ assert(a.class == Integer || a.class == Fixnum )
assert(a == 35)
# timeout - probably unset.
a = settings.timeout
- assert(a.class == Fixnum)
+ assert(a.class == Integer || a.class == Fixnum )
# store a number
settings._store('timeout', 5)
a = settings.timeout
- assert(a.class == Fixnum)
+ assert(a.class == Integer || a.class == Fixnum )
assert(a == 5)
# store a string
settings._store('timeout', '35')
a = settings.timeout
- assert(a.class == Fixnum)
+ assert(a.class == Integer || a.class == Fixnum )
assert(a == 35)