Found and killed the test suite instability.

Manager#processor_died test was spinning up a Processor in the background which ate jobs created in other tests!
murtuzakz · Oct 21, 2015 · 58b2696 · 58b2696
1 parent 9736321
commit 58b2696
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,12 +4,12 @@ gemspec
 gem 'rails', '~> 4.2'
 gem 'simplecov'
 gem 'minitest'
+gem 'minitest-utils'
 gem 'toxiproxy'
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'         # if using anything in the ruby standard library
   gem 'psych'                    # if using yaml
-  gem 'minitest'                 # if using minitest
   gem 'rubinius-developer_tools' # if using any of coverage, debugger, profiler
 end
 

diff --git a/test/helper.rb b/test/helper.rb
@@ -1,4 +1,7 @@
 $TESTING = true
+# disable minitest/parallel threads
+ENV["N"] = "0"
+
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start do
@@ -33,7 +36,6 @@
 end
 
 require 'minitest/autorun'
-require 'minitest/pride'
 
 require 'sidekiq'
 require 'sidekiq/util'
@@ -62,3 +64,13 @@ def capture_logging(lvl=Logger::INFO)
     Sidekiq.logger = old
   end
 end
+
+def with_logging(lvl=Logger::DEBUG)
+  old = Sidekiq.logger.level
+  begin
+    Sidekiq.logger.level = lvl
+    yield
+  ensure
+    Sidekiq.logger.level = old
+  end
+end
diff --git a/test/test_actors.rb b/test/test_actors.rb
@@ -5,7 +5,7 @@
 require 'sidekiq/processor'
 
 class TestActors < Sidekiq::Test
-  class SomeWorker
+  class JoeWorker
     include Sidekiq::Worker
     def perform(slp)
       raise "boom" if slp == "boom"
@@ -30,7 +30,7 @@ def perform(slp)
         ss = Sidekiq::ScheduledSet.new
         q = Sidekiq::Queue.new
 
-        SomeWorker.perform_in(0.01, 0)
+        JoeWorker.perform_in(0.01, 0)
 
         assert_equal 0, q.size
         assert_equal 1, ss.size
@@ -82,7 +82,7 @@ def options
         mgr = Mgr.new
 
         p = Sidekiq::Processor.new(mgr)
-        SomeWorker.perform_async(0)
+        JoeWorker.perform_async(0)
 
         a = $count
         p.process_one
@@ -94,7 +94,9 @@ def options
         mgr = Mgr.new
 
         p = Sidekiq::Processor.new(mgr)
-        SomeWorker.perform_async("boom")
+        JoeWorker.perform_async("boom")
+        q = Sidekiq::Queue.new
+        assert_equal 1, q.size
 
         a = $count
         mgr.mutex.synchronize do
@@ -115,7 +117,9 @@ def options
         mgr = Mgr.new
 
         p = Sidekiq::Processor.new(mgr)
-        SomeWorker.perform_async(1)
+        JoeWorker.perform_async(1)
+        q = Sidekiq::Queue.new
+        assert_equal 1, q.size
 
         a = $count
         p.start

diff --git a/test/test_manager.rb b/test/test_manager.rb
@@ -26,10 +26,14 @@ def new_manager(opts)
       mgr = new_manager(options)
       init_size = mgr.workers.size
       processor = mgr.workers.first
-      mgr.processor_died(processor, 'ignored')
-
-      assert_equal init_size, mgr.workers.size
-      refute mgr.workers.include?(processor)
+      begin
+        mgr.processor_died(processor, 'ignored')
+
+        assert_equal init_size, mgr.workers.size
+        refute mgr.workers.include?(processor)
+      ensure
+        mgr.workers.each {|p| p.terminate(true) }
+      end
     end
 
     it 'does not support invalid concurrency' do