Wrap yields in EM.next_tick to fix possible race conditions when calling Sync.reactor.perform after starting reactor. Fix chrismccord#34.

chrismccord · chrismccord · commit 310e2673addc · 2013-05-29T23:28:05.000-04:00
diff --git a/lib/sync/reactor.rb b/lib/sync/reactor.rb
@@ -5,7 +5,7 @@ class Reactor
     # Execute EventMachine bound code block, waiting for reactor to start if
     # not yet started or reactor thread has gone away
     def perform
-      return yield if running?
+      return EM.next_tick{ yield } if running?
       cleanly_shutdown_reactor
       condition = new_cond
       Thread.new do
@@ -19,7 +19,7 @@ def perform
       end
       synchronize do
         condition.wait_until { EM.reactor_running? }
-        yield
+        EM.next_tick { yield }
       end
     end
 
diff --git a/test/sync/message_test.rb b/test/sync/message_test.rb
@@ -50,6 +50,7 @@
       end
 
       it 'should publish array of messages with single post to faye' do
+        EM.expects(:next_tick).once.returns true
         assert Sync.client.batch_publish(@messages)
       end
     end
diff --git a/test/sync/reactor_test.rb b/test/sync/reactor_test.rb
@@ -11,6 +11,7 @@
       ran_block = false
       Sync.reactor.perform { ran_block = true}
       assert Sync.reactor.running?
+      sleep 0.1
       assert ran_block
     end
   end
