merge master

test/test_launcher.rb

@@ -92,7 +92,6 @@ describe Sidekiq::Launcher do
           assert_in_delta 60000, expires, 50
         end
       end
-    end
 
     it 'fires new heartbeat events' do
       i = 0
@@ -124,6 +123,7 @@ describe Sidekiq::Launcher do
         assert_in_delta 60000, expires, 500
       end
     end
+  end
 
     describe 'when manager is stopped' do
       before do
@@ -151,4 +151,5 @@ describe Sidekiq::Launcher do
   def options
     { :concurrency => 3, :queues => ['default'], :tag => 'myapp' }
   end
+
 end

test/test_processor.rb

@@ -333,25 +333,33 @@ describe Sidekiq::Processor do
         @mgr.expect(:options, {:queues => ['default'], job_logger: CustomJobLogger})
         @processor = ::Sidekiq::Processor.new(@mgr)
       end
+    end
+  end
 
-      describe 'when failed' do
-        let(:failed_today_key) { "stat:failed:#{Time.now.utc.strftime("%Y-%m-%d")}" }
+  describe 'stats' do
+    before do
+      Sidekiq.redis {|c| c.flushdb }
+    end
 
-        def failed_job
-          msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
-          begin
-            @processor.process(work(msg))
-          rescue TestProcessorException
-          end
-        end
-
-        it 'increments failed stat' do
-          Sidekiq::Processor::FAILURE.reset
-          failed_job
-          assert_equal 1, Sidekiq::Processor::FAILURE.reset
-        end
+    def failed_job
+      msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
+      begin
+        @processor.process(work(msg))
+      rescue TestProcessorException
       end
     end
+
+    def successful_job
+      msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
+      @mgr.expect(:processor_done, nil, [@processor])
+      @processor.process(work(msg))
+    end
+
+    it 'increments processed stat' do
+      Sidekiq::Processor::PROCESSED.reset
+      successful_job
+      assert_equal 1, Sidekiq::Processor::PROCESSED.reset
+    end
   end
 
   describe 'custom job logger class' do

test/test_sidekiqctl.rb

@@ -17,6 +17,10 @@ def output(section = 'all')
 end
 
 describe Sidekiq::Ctl do
+  before do
+    Sidekiq.redis {|c| c.flushdb}
+  end
+
   describe 'status' do
     describe 'version' do
       it 'displays the current Sidekiq version' do