Fix timeout settings because CI occasionally fail at JRuby

Author: supercaracal

.travis.yml

@@ -26,6 +26,7 @@ env:
   global:
     - VERBOSE=true
     - TIMEOUT=30
+    - LOW_TIMEOUT=0.01
   matrix:
     - DRIVER=ruby      REDIS_BRANCH=3.0
     - DRIVER=ruby      REDIS_BRANCH=3.2
@@ -43,17 +44,14 @@ branches:
 
 matrix:
   exclude:
-    # hiredis
     - rvm: jruby-9.1.17.0
-      env: DRIVER=hiredis   REDIS_BRANCH=3.0
+  include:
     - rvm: jruby-9.1.17.0
-      env: DRIVER=hiredis   REDIS_BRANCH=3.2
-
-    # synchrony
+      env: DRIVER=ruby REDIS_BRANCH=3.0 LOW_TIMEOUT=0.1
     - rvm: jruby-9.1.17.0
-      env: DRIVER=synchrony REDIS_BRANCH=3.0
+      env: DRIVER=ruby REDIS_BRANCH=3.2 LOW_TIMEOUT=0.1
     - rvm: jruby-9.1.17.0
-      env: DRIVER=synchrony REDIS_BRANCH=3.2
+      env: DRIVER=ruby REDIS_BRANCH=4.0 LOW_TIMEOUT=0.1
 
 notifications:
   irc:

test/cluster_client_options_test.rb

@@ -38,8 +38,7 @@ def test_client_accepts_valid_node_configs
 
   def test_client_accepts_valid_options
     assert_nothing_raised do
-      timeout = Float(ENV['TIMEOUT'] || 1.0)
-      build_another_client(timeout: timeout)
+      build_another_client(timeout: TIMEOUT)
     end
   end
 

test/helper.rb

@@ -15,9 +15,11 @@
 require_relative "support/connection/#{ENV["DRIVER"]}"
 require_relative 'support/cluster/orchestrator'
 
-PORT    = 6381
-OPTIONS = {:port => PORT, :db => 15, :timeout => Float(ENV["TIMEOUT"] || 0.1)}
-NODES   = ["redis://127.0.0.1:#{PORT}/15"]
+PORT        = 6381
+DB          = 15
+TIMEOUT     = Float(ENV['TIMEOUT'] || 0.1)
+LOW_TIMEOUT = Float(ENV['LOW_TIMEOUT'] || 0.01) # for blocking-command tests
+OPTIONS     = { port: PORT, db: DB, timeout: TIMEOUT }.freeze
 
 def driver(*drivers, &blk)
   if drivers.map(&:to_s).include?(ENV["DRIVER"])
@@ -178,9 +180,10 @@ def _new_client(options = {})
   end
 
   module Distributed
-
     include Generic
 
+    NODES = ["redis://127.0.0.1:#{PORT}/15"].freeze
+
     def version
       Version.new(redis.info.first["redis_version"])
     end

test/lint/blocking_commands.rb

@@ -1,7 +1,5 @@
 module Lint
   module BlockingCommands
-    LOW_TIMEOUT = 0.01
-
     def setup
       super