Fix issues with non-deterministic global test state

lib/sidekiq/cli.rb

@@ -20,7 +20,7 @@ module Sidekiq
 
   class CLI
     include Util
-    include Singleton
+    include Singleton unless $TESTING
 
     # Used for CLI testing
     attr_accessor :code

test/test_api.rb

@@ -261,7 +261,7 @@ class TestApi < Sidekiq::Test
 
       Sidekiq.redis do |conn|
         refute conn.smembers('queues').include?('foo')
-        refute conn.exists('queues:foo')
+        refute conn.exists('queue:foo')
       end
     end
 

test/test_cli.rb

@@ -2,20 +2,26 @@ require 'helper'
 require 'sidekiq/cli'
 require 'tempfile'
 
-cli = Sidekiq::CLI.instance
+class Sidekiq::CLI
-def cli.die(code)
+  def die(code)
-  @code = code
+    @code = code
-end
+  end
 
-def cli.valid?
+  def valid?
-  !@code
+    !@code
+  end
 end
 
 class TestCli < Sidekiq::Test
   describe 'CLI#parse' do
 
     before do
-      @cli = Sidekiq::CLI.instance
+      @cli = Sidekiq::CLI.new
+      @opts = Sidekiq.options.dup
+    end
+
+    after do
+      Sidekiq.options = @opts
     end
 
     it 'does not require the specified Ruby code' do

test/test_client.rb

@@ -24,7 +24,7 @@ class TestClient < Sidekiq::Test
     end
 
     after do
-      Sidekiq.instance_variable_set(:@redis, REDIS)
+      Sidekiq.redis = REDIS
       Sidekiq::Client.instance_variable_set(:@default, nil)
     end
 

test/test_fetch.rb

@@ -11,6 +11,10 @@ class TestFetcher < Sidekiq::Test
       end
     end
 
+    after do
+      Sidekiq.redis = REDIS
+    end
+
     it 'retrieves' do
       fetch = Sidekiq::BasicFetch.new(:queues => ['basic', 'bar'])
       uow = fetch.retrieve_work

test/test_manager.rb

@@ -5,6 +5,7 @@ class TestManager < Sidekiq::Test
 
   describe 'manager' do
     before do
+      Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 

test/test_web.rb

@@ -92,7 +92,7 @@ class TestWeb < Sidekiq::Test
 
       Sidekiq.redis do |conn|
         refute conn.smembers('queues').include?('foo')
-        refute conn.exists('queues:foo')
+        refute conn.exists('queue:foo')
       end
     end