Merge pull request #264 from ruby-concurrency/intermittently-failing-tests

Fix Intermittently Failing Tests

Author: jdantonio

.travis.yml

@@ -26,4 +26,4 @@ matrix:
     - rvm: jruby-head
     - rvm: 1.9.3
 
-script: "rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"
+script: "bundle exec rake compile && bundle exec rspec --color --backtrace --tag ~unfinished --seed 1 --format documentation ./spec"

examples/actor_stress_test.rb

@@ -47,7 +47,7 @@ def run
       "with #{@threads} thread#{plural.call(@threads)} each " +
       "and #{@loops} loop#{plural.call(@loops)} per thread..."
 
-    Benchmark.bm do |bm|
+    Benchmark.bmbm do |bm|
       @tests.times do
         bm.report do
           test(@threads, @loops)

examples/benchmark_atomic_boolean.rb

@@ -14,16 +14,17 @@ def atomic_test(clazz, opts = {})
   latch = Concurrent::CountDownLatch.new(threads)
 
   print "Testing with #{clazz}...\n"
-  stats = Benchmark.measure do
-    threads.times do |i|
-      Thread.new do
-        tests.times{ atomic.value = true }
-        latch.count_down
+  Benchmark.bmbm do |bm|
+    bm.report do
+      threads.times do |i|
+        Thread.new do
+          tests.times{ atomic.value = true }
+          latch.count_down
+        end
       end
+      latch.wait
     end
-    latch.wait
   end
-  print stats
 end
 
 puts "Testing with #{RbConfig::CONFIG['ruby_install_name']} #{RUBY_VERSION}"

examples/benchmark_atomic_fixnum.rb

@@ -14,16 +14,17 @@ def atomic_test(clazz, opts = {})
   latch = Concurrent::CountDownLatch.new(threads)
 
   print "Testing with #{clazz}...\n"
-  stats = Benchmark.measure do
-    threads.times do |i|
-      Thread.new do
-        tests.times{ num.up }
-        latch.count_down
+  Benchmark.bmbm do |bm|
+    bm.report do
+      threads.times do |i|
+        Thread.new do
+          tests.times{ num.up }
+          latch.count_down
+        end
       end
+      latch.wait
     end
-    latch.wait
   end
-  print stats
 end
 
 puts "Testing with #{RbConfig::CONFIG['ruby_install_name']} #{RUBY_VERSION}"

examples/lazy_and_delay.rb renamed to examples/benchmark_lazy_and_delay.rb

@@ -25,31 +25,44 @@ module Concurrent
         it 'should receive the other value' do
           first_value = nil
           second_value = nil
+          latch = Concurrent::CountDownLatch.new(2)
 
-          thread_1 = Thread.new { first_value = subject.exchange(2) }
-          thread_2 = Thread.new { second_value = subject.exchange(4) }
+          threads = [
+            Thread.new { first_value = subject.exchange(2); latch.count_down },
+            Thread.new { second_value = subject.exchange(4); latch.count_down }
+          ]
+
+          latch.wait(1)
 
-          [thread_1, thread_2].each(&:join)
           expect(first_value).to eq 4
           expect(second_value).to eq 2
+
+          threads.each {|t| t.kill }
         end
 
         it 'can be reused' do
           first_value = nil
           second_value = nil
+          latch_1 = Concurrent::CountDownLatch.new(2)
+          latch_2 = Concurrent::CountDownLatch.new(2)
 
-          thread_1 = Thread.new { first_value = subject.exchange(1) }
-          thread_2 = Thread.new { second_value = subject.exchange(0) }
+          threads = [
+            Thread.new { first_value = subject.exchange(1); latch_1.count_down },
+            Thread.new { second_value = subject.exchange(0); latch_1.count_down }
+          ]
 
-          [thread_1, thread_2].each(&:join)
-
-          thread_1 = Thread.new { first_value = subject.exchange(10) }
-          thread_2 = Thread.new { second_value = subject.exchange(12) }
+          latch_1.wait(1)
+          threads.each {|t| t.kill }
 
-          [thread_1, thread_2].each(&:join)
+          threads = [
+            Thread.new { first_value = subject.exchange(10); latch_2.count_down },
+            Thread.new { second_value = subject.exchange(12); latch_2.count_down }
+          ]
 
+          latch_2.wait(1)
           expect(first_value).to eq 12
           expect(second_value).to eq 10
+          threads.each {|t| t.kill }
         end
       end
 

spec/concurrent/exchanger_spec.rb

@@ -96,7 +96,7 @@ def trigger_observable(observable)
     context 'instance #execute' do
 
       it 'does nothing unless the state is :unscheduled' do
-        expect(Thread).not_to receive(:new).with(any_args)
+        expect(Concurrent).not_to receive(:timer).with(any_args)
         task = ScheduledTask.new(1){ nil }
         task.instance_variable_set(:@state, :pending)
         task.execute

spec/concurrent/scheduled_task_spec.rb

@@ -1 +1 @@
-Subproject commit 5aff4706f70d757c15830edd66d74759ff364eda
+Subproject commit 1d2f9299b93339d8dc4ef72eb17bb892e91bd6f5