Improve tests

Author: pitr-ch

spec/concurrent/atomic/condition_spec.rb

@@ -270,18 +270,14 @@ module Concurrent
 
         describe '#broadcast' do
           it 'wakes up all threads' do
-            latch = CountDownLatch.new(2)
             mutex = Mutex.new
 
-            t1 = Thread.new { mutex.synchronize { subject.wait(mutex); latch.count_down } }
-            t2 = Thread.new { mutex.synchronize { subject.wait(mutex); latch.count_down } }
-
-            sleep(0.1)
+            t1 = Thread.new { mutex.synchronize { subject.wait(mutex)} }
+            t2 = Thread.new { mutex.synchronize { subject.wait(mutex)} }
             mutex.synchronize { subject.broadcast }
-            sleep(0.2)
-
-            expect(latch.count).to eq 0
-            [t1, t2].each { |t| t.kill }
+            [t1, t2].each do |t|
+              expect(t.join(1)).to eq t # TODO returns sometimes nil
+            end
           end
         end
       end

spec/concurrent/atomic/count_down_latch_spec.rb

@@ -99,8 +99,8 @@ module Concurrent
       before(:each) do
         def subject.simulate_spurious_wake_up
           synchronize do
-            signal
-            broadcast
+            ns_signal
+            ns_broadcast
           end
         end
       end

spec/concurrent/atomic/semaphore_spec.rb

@@ -20,7 +20,7 @@
     context 'not enough permits available' do
       it 'should block thread until permits are available' do
         semaphore.drain_permits
-        Thread.new { sleep(0.2) && semaphore.release }
+        Thread.new { sleep(0.2); semaphore.release }
 
         result = semaphore.acquire
         expect(result).to be_nil
@@ -64,7 +64,7 @@
 
       it 'acquires when permits are available within timeout' do
         semaphore.drain_permits
-        Thread.new { sleep 0.1 && semaphore.release }
+        Thread.new { sleep 0.1; semaphore.release }
         result = semaphore.try_acquire(1, 1)
         expect(result).to be_truthy
       end
@@ -112,15 +112,16 @@ def subject.simulate_spurious_wake_up
             @condition.broadcast
           end
         end
+
         subject.drain_permits
       end
 
       it 'should resist to spurious wake ups without timeout' do
         actual = Concurrent::AtomicBoolean.new(true)
-        latch = Concurrent::CountDownLatch.new
+        latch  = Concurrent::CountDownLatch.new
 
         # would set actual to false
-        t = Thread.new { latch.wait(1); actual.value = subject.acquire }
+        t      = Thread.new { latch.wait(1); actual.value = subject.acquire }
 
         latch.count_down
         subject.simulate_spurious_wake_up
@@ -132,10 +133,10 @@ def subject.simulate_spurious_wake_up
 
       it 'should resist to spurious wake ups with timeout' do
         actual = Concurrent::AtomicBoolean.new(true)
-        latch = Concurrent::CountDownLatch.new
+        latch  = Concurrent::CountDownLatch.new
 
         # sets actual to false in another thread
-        t = Thread.new { latch.wait(1); actual.value = subject.try_acquire(1, 0.3) }
+        t      = Thread.new { latch.wait(1); actual.value = subject.try_acquire(1, 0.3) }
 
         latch.count_down
         subject.simulate_spurious_wake_up

spec/concurrent/executor/global_thread_pool_shared.rb

@@ -26,8 +26,7 @@
     it 'aliases #<<' do
       latch = Concurrent::CountDownLatch.new(1)
       subject << proc { latch.count_down }
-      latch.wait(0.2)
-      expect(latch.count).to eq 0
+      expect(latch.wait(0.2)).to eq true
     end
   end
 end