Improved global config cleanup during testing.

Author: jdantonio

spec/concurrent/configuration_spec.rb

@@ -5,25 +5,17 @@ module Concurrent
     before(:each) do
       Concurrent.class_variable_set(
         :@@global_fast_executor,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent::ImmediateExecutor.new })
+        Concurrent::LazyReference.new{ Concurrent::ImmediateExecutor.new })
       Concurrent.class_variable_set(
         :@@global_io_executor,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent::ImmediateExecutor.new })
+        Concurrent::LazyReference.new{ Concurrent::ImmediateExecutor.new })
       Concurrent.class_variable_set(
         :@@global_timer_set,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent::ImmediateExecutor.new })
+        Concurrent::LazyReference.new{ Concurrent::ImmediateExecutor.new })
     end
 
     after(:each) do
-      Concurrent.class_variable_set(
-        :@@global_fast_executor,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent.new_fast_executor })
-      Concurrent.class_variable_set(
-        :@@global_io_executor,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent.new_io_executor })
-      Concurrent.class_variable_set(
-        :@@global_timer_set,
-        Concurrent::Delay.new(executor: :immediate){ Concurrent::TimerSet.new })
+      reset_gem_configuration
     end
 
     context 'global executors' do

spec/support/example_group_extensions.rb

@@ -3,6 +3,7 @@
 
 module Concurrent
   module TestHelpers
+
     def delta(v1, v2)
       if block_given?
         v1 = yield(v1)
@@ -31,19 +32,23 @@ def do_no_reset!
       @do_not_reset = true
     end
 
+    GLOBAL_EXECUTORS = [
+      [:@@global_fast_executor, ->{ LazyReference.new{ Concurrent.new_fast_executor }}],
+      [:@@global_io_executor, ->{ LazyReference.new{ Concurrent.new_io_executor }}],
+      [:@@global_timer_set, ->{ LazyReference.new{ Concurrent::TimerSet.new }}],
+    ]
+
     @@killed = false
 
     def reset_gem_configuration
       if @@killed
-        Concurrent.class_variable_set(
-          :@@global_fast_executor,
-          Concurrent::Delay.new(executor: :immediate){ Concurrent.new_fast_executor })
-        Concurrent.class_variable_set(
-          :@@global_io_executor,
-          Concurrent::Delay.new(executor: :immediate){ Concurrent.new_io_executor })
-        Concurrent.class_variable_set(
-          :@@global_timer_set,
-          Concurrent::Delay.new(executor: :immediate){ Concurrent::TimerSet.new })
+        GLOBAL_EXECUTORS.each do |var, factory|
+          executor = Concurrent.class_variable_get(var).value
+          executor.shutdown
+          executor.kill
+          executor = nil
+          Concurrent.class_variable_set(var, factory.call)
+        end
         @@killed = false
       end
     end