Fixed buggy test setup and remove kill_rogue_threads.

Author: jdantonio

spec/concurrent/actor_spec.rb

@@ -15,9 +15,6 @@ module Actor
     # end
 
     describe 'Concurrent::Actor' do
-      prepend_before do
-        do_no_reset!
-      end
 
       def terminate_actors(*actors)
         actors.each do |actor|

spec/concurrent/configuration_spec.rb

@@ -3,10 +3,8 @@ module Concurrent
   describe Configuration do
 
     before(:each) do
-      reset_gem_configuration
-    end
-
-    after(:each) do
+      # redundant - done in spec_helper.rb
+      # done here again for explicitness
       reset_gem_configuration
     end
 
@@ -28,9 +26,9 @@ module Concurrent
       end
 
       specify '#terminate_pools! acts on all executors with auto_terminate: true' do
-        expect(Concurrent.global_fast_executor).to receive(:kill).with(no_args).and_call_original
-        expect(Concurrent.global_io_executor).to receive(:kill).with(no_args).and_call_original
-        expect(Concurrent.global_timer_set).to receive(:kill).with(no_args).and_call_original
+        expect(Concurrent.global_fast_executor).to receive(:kill).once.with(no_args).and_call_original
+        expect(Concurrent.global_io_executor).to receive(:kill).once.with(no_args).and_call_original
+        expect(Concurrent.global_timer_set).to receive(:kill).once.with(no_args).and_call_original
         Concurrent.terminate_pools!
       end
     end

spec/spec_helper.rb

@@ -2,8 +2,8 @@
 require 'coveralls'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
 ]
 
 SimpleCov.start do
@@ -40,9 +40,4 @@
     #TODO: Better configuration management in individual test suites
     reset_gem_configuration
   end
-
-  config.after(:each) do
-    #TODO: Better thread management in individual test suites
-    kill_rogue_threads(false)
-  end
 end

spec/support/example_group_extensions.rb

@@ -16,40 +16,23 @@ def delta(v1, v2)
     include EngineDetector
 
     def use_c_extensions?
-      Concurrent.allow_c_extensions? # from extension_helper.rb
-    end
-
-    def do_no_reset!
-      @do_not_reset = true
+      Concurrent.allow_c_extensions?
     end
 
     GLOBAL_EXECUTORS = [
-        [:GLOBAL_FAST_EXECUTOR, -> { Delay.new { Concurrent.new_fast_executor(auto_terminate: true) } }],
-        [:GLOBAL_IO_EXECUTOR, -> { Delay.new { Concurrent.new_io_executor(auto_terminate: true) } }],
-        [:GLOBAL_TIMER_SET, -> { Delay.new { Concurrent::TimerSet.new(auto_terminate: true) } }],
+      [:GLOBAL_FAST_EXECUTOR, -> { Delay.new { Concurrent.new_fast_executor(auto_terminate: true) } }],
+      [:GLOBAL_IO_EXECUTOR, -> { Delay.new { Concurrent.new_io_executor(auto_terminate: true) } }],
+      [:GLOBAL_TIMER_SET, -> { Delay.new { Concurrent::TimerSet.new(auto_terminate: true) } }],
     ]
 
-    @@killed = false
-
     def reset_gem_configuration
-      if @@killed
-        GLOBAL_EXECUTORS.each do |var, factory|
-          executor = Concurrent.const_get(var).value!
-          executor.shutdown
-          executor.kill
-          Concurrent.const_set(var, factory.call)
-        end
-        @@killed = false
-      end
-    end
-
-    def kill_rogue_threads(warning = true)
-      return if @do_not_reset
-      warn('[DEPRECATED] brute force thread control being used -- tests need updated') if warning
-      Thread.list.each do |thread|
-        thread.kill unless thread == Thread.current
+      GLOBAL_EXECUTORS.each do |var, factory|
+        executor = Concurrent.const_get(var).value!
+        executor.shutdown
+        executor.wait_for_termination(0.2)
+        executor.kill
+        Concurrent.const_set(var, factory.call)
       end
-      @@killed = true
     end
 
     def monotonic_interval