Merge pull request #423 from hfenton/fix_buggy_tests

Fix buggy tests

Author: jdantonio

spec/concurrent/agent_spec.rb

@@ -691,36 +691,34 @@ def update(time, old_value, new_value)
         it 'removes all actions from the queue when :clear_actions is true' do
           latch = Concurrent::CountDownLatch.new
           subject = Agent.new(0, error_mode: :fail)
+          end_latch = Concurrent::CountDownLatch.new
 
           subject.send_via(executor){ latch.wait; raise StandardError }
-          5.times{ subject.send_via(executor){ nil } }
-
-          queue = subject.instance_variable_get(:@queue)
-          expect(queue.size).to be > 0
+          subject.send_via(executor){ end_latch.count_down }
 
           latch.count_down
           10.times{ break if subject.failed?; sleep(0.1) }
 
           subject.restart(42, clear_actions: true)
-          expect(queue).to be_empty
+          result = end_latch.wait(0.1)
+          expect(result).to be false
         end
 
-        it 'does not clear the action queue when :clear_actions is false', buggy: true do
+        it 'does not clear the action queue when :clear_actions is false' do
           latch = Concurrent::CountDownLatch.new
+          end_latch = Concurrent::CountDownLatch.new
+
           subject = Agent.new(0, error_mode: :fail)
 
           subject.send_via(executor){ latch.wait; raise StandardError }
-          5.times{ subject.send_via(executor){ nil } }
-
-          queue = subject.instance_variable_get(:@queue)
-          size = queue.size
-          expect(size).to be > 0
+          subject.send_via(executor){ end_latch.count_down }
 
           latch.count_down
           10.times{ break if subject.failed?; sleep(0.1) }
 
           subject.restart(42, clear_actions: false)
-          expect(queue.size).to eq size-1
+          result = end_latch.wait(3)
+          expect(result).to be true
         end
 
         it 'does not clear the action queue when :clear_actions is not given' do

spec/concurrent/future_spec.rb

@@ -85,8 +85,9 @@ def get_ivar_from_args(opts)
         Future.execute(executor: executor){ nil }
       end
 
-      it 'uses the global io executor by default', buggy: true do
-        expect(Concurrent).to receive(:global_io_executor).and_return(executor)
+      it 'uses the global io executor by default' do
+        allow(Concurrent).to receive(:global_io_executor).and_return(executor)
+        expect(executor).to receive(:post).and_call_original
         Future.execute{ nil }
       end
     end