Be more patient while gathering the expected responses

rails · Jan 29, 2016 · 0b94afb · 0b94afb
1 parent 786ed1b
commit 0b94afb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
@@ -154,10 +154,10 @@ def read_message
       msg
     end
 
-    def read_messages
+    def read_messages(expected_size = 0)
       list = []
       loop do
-        @has_messages.wait(WAIT_WHEN_NOT_EXPECTING_EVENT)
+        @has_messages.wait(list.size < expected_size ? WAIT_WHEN_EXPECTING_EVENT : WAIT_WHEN_NOT_EXPECTING_EVENT)
         if @has_messages.set?
           list << read_message
         else
@@ -222,8 +222,7 @@ def test_interacting_clients
         barrier_1.wait WAIT_WHEN_EXPECTING_EVENT
         c.send_message command: 'message', identifier: JSON.dump(channel: 'EchoChannel'), data: JSON.dump(action: 'bulk', message: 'hello')
         barrier_2.wait WAIT_WHEN_EXPECTING_EVENT
-        sleep 1
-        assert_equal clients.size, c.read_messages.size
+        assert_equal clients.size, c.read_messages(clients.size).size
       } }.each(&:wait!)
 
       clients.map {|c| Concurrent::Future.execute { c.close } }.each(&:wait!)