From 28348e068151cd144da28a87d63853a328e393e7 Mon Sep 17 00:00:00 2001 From: Gaurish Sharma Date: Fri, 2 Aug 2013 20:27:28 +0530 Subject: Add timeout to test_async_stream Without timeout: this test executed infinitely on JRuby Passes on MRI With Timeout: this test gracefully fails on JRuby Passes on MRI, tested on v2.0 & v1.9.3 --- actionpack/test/controller/live_stream_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/test/controller/live_stream_test.rb') diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb index 34164a19f0..e727b27db0 100644 --- a/actionpack/test/controller/live_stream_test.rb +++ b/actionpack/test/controller/live_stream_test.rb @@ -135,7 +135,7 @@ module ActionController @controller.process :blocking_stream - assert t.join + assert t.join(3), 'timeout expired before the thread terminated' end def test_thread_locals_get_copied -- cgit v1.2.3