More generous pool termination timeouts

Author: pitr-ch

spec/concurrent/agent_spec.rb

@@ -862,7 +862,7 @@ def update(time, old_value, new_value)
           expect(bucket).to eq [1, 2, 3]
 
           executor.kill
-          expect(executor.wait_for_termination(1)).to eq true
+          expect(executor.wait_for_termination(pool_termination_timeout)).to eq true
         end
       end
 

spec/concurrent/executor/cached_thread_pool_spec.rb

@@ -10,7 +10,7 @@ module Concurrent
 
     after(:each) do
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
     end
 
     it_should_behave_like :thread_pool
@@ -56,7 +56,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.min_length).to eq 0
       end
     end
@@ -79,7 +79,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.max_length).to eq described_class::DEFAULT_MAX_POOL_SIZE
       end
     end
@@ -102,7 +102,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.largest_length).to be > 0
       end
     end
@@ -130,14 +130,14 @@ module Concurrent
             subject = CachedThreadPool.new(fallback_policy: :discard)
             expect(subject.fallback_policy).to eq :discard
             subject.shutdown
-            expect(subject.wait_for_termination(1)).to eq true
+            expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
           end
 
           it 'defaults :fallback_policy to :abort' do
             subject = CachedThreadPool.new
             expect(subject.fallback_policy).to eq :abort
             subject.shutdown
-            expect(subject.wait_for_termination(1)).to eq true
+            expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
           end
 
           it 'raises an exception if given an invalid :fallback_policy' do

spec/concurrent/executor/executor_service_shared.rb

@@ -4,7 +4,7 @@
 
   after(:each) do
     subject.shutdown
-    expect(subject.wait_for_termination(1)).to eq true
+    expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
   end
 
   it_should_behave_like :global_thread_pool
@@ -43,18 +43,18 @@
       subject.post{ sleep(0.5) }
       subject.shutdown
       expect(subject).not_to be_running
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
     end
 
     it 'returns false when the thread pool is shutdown' do
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       expect(subject).not_to be_running
     end
 
     it 'returns false when the thread pool is killed' do
       subject.kill
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       expect(subject).not_to be_running
     end
   end
@@ -67,7 +67,7 @@
       subject.post{ sleep(0.1); latch1.count_down }
       latch1.wait(1)
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       begin
         subject.post{ latch2.count_down }
       rescue Concurrent::RejectedExecutionError
@@ -97,7 +97,7 @@
       latch = Concurrent::CountDownLatch.new(1)
       subject.post{ sleep(0.1); latch.count_down }
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       expect(latch.wait(1)).to be_truthy
     end
 
@@ -107,7 +107,7 @@
         subject.post { sleep 0.1; q << i }
       end
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       expect(q.length).to eq 5
     end
 
@@ -120,7 +120,7 @@
         subject.post{ expected.increment }
       rescue Concurrent::RejectedExecutionError
       end
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       expect(expected.value).to eq(2)
     end
   end
@@ -164,14 +164,14 @@
       10.times { subject << proc{ nil } }
       sleep(0.1)
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to be_truthy
+      expect(subject.wait_for_termination(pool_termination_timeout)).to be_truthy
     end
 
     it 'returns true when shutdown successfully completes before timeout' do
       subject.post{ sleep(0.5) }
       sleep(0.1)
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to be_truthy
+      expect(subject.wait_for_termination(pool_termination_timeout)).to be_truthy
     end
 
     it 'returns false when shutdown fails to complete before timeout' do

spec/concurrent/executor/fixed_thread_pool_spec.rb

@@ -9,7 +9,7 @@ module Concurrent
 
     after(:each) do
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
     end
 
     it_should_behave_like :thread_pool
@@ -56,21 +56,21 @@ module Concurrent
         subject = described_class.new(5, :max_queue => 10)
         expect(subject.max_queue).to eq 10
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       it 'correctly sets valid :fallback_policy' do
         subject = described_class.new(5, :fallback_policy => :caller_runs)
         expect(subject.fallback_policy).to eq :caller_runs
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       it "correctly sets valid :idletime" do
         subject = described_class.new(5, :idletime => 10)
         expect(subject.idletime).to eq 10
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       it 'raises an exception if given an invalid :fallback_policy' do
@@ -98,7 +98,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.min_length).to eq num_threads
       end
     end
@@ -121,7 +121,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.max_length).to eq num_threads
       end
     end
@@ -154,7 +154,7 @@ module Concurrent
         subject.post { latch.count_down }
         latch.wait(0.1)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         expect(subject.largest_length).to eq num_threads
       end
     end
@@ -186,7 +186,7 @@ module Concurrent
         expect(pool.length).to eq 5
         latch.count_down
         pool.shutdown
-        expect(pool.wait_for_termination(1)).to eq true
+        expect(pool.wait_for_termination(pool_termination_timeout)).to eq true
       end
     end
 
@@ -217,7 +217,7 @@ module Concurrent
           latch.wait(1)
         }.to raise_error(RejectedExecutionError)
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       # On discard, we'd expect no error, but also not all five results
@@ -237,7 +237,7 @@ module Concurrent
 
         expect(@queue.length).to be < 5
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       # To check for caller_runs, we'll check how many unique threads
@@ -267,7 +267,7 @@ module Concurrent
         expect(a.uniq.size).to be_within(1).of(3) # one for each of the two threads, plus the caller
 
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
     end
 
@@ -283,7 +283,7 @@ module Concurrent
           subject = FixedThreadPool.new(5, fallback_policy: :discard)
           expect(subject.fallback_policy).to eq :discard
           subject.shutdown
-          expect(subject.wait_for_termination(1)).to eq true
+          expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
         end
 
       else
@@ -307,7 +307,7 @@ module Concurrent
             sleep(0.1)
             expect(pool.length).to eq 5
             pool.shutdown
-            expect(pool.wait_for_termination(1)).to eq true
+            expect(pool.wait_for_termination(pool_termination_timeout)).to eq true
           end
         end
       end

spec/concurrent/executor/java_single_thread_executor_spec.rb

@@ -8,7 +8,7 @@ module Concurrent
 
       after(:each) do
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       subject { JavaSingleThreadExecutor.new }

spec/concurrent/executor/java_thread_pool_executor_spec.rb

@@ -8,7 +8,7 @@ module Concurrent
 
       after(:each) do
         subject.shutdown
-        expect(subject.wait_for_termination(1)).to eq true
+        expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
       end
 
       subject do

spec/concurrent/executor/ruby_single_thread_executor_spec.rb

@@ -6,7 +6,7 @@ module Concurrent
 
     after(:each) do
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
     end
 
     subject { RubySingleThreadExecutor.new }

spec/concurrent/executor/ruby_thread_pool_executor_spec.rb

@@ -6,7 +6,7 @@ module Concurrent
 
     after(:each) do
       subject.shutdown
-      expect(subject.wait_for_termination(1)).to eq true
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
     end
 
     subject do