Skip to content
Browse files

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
  • Loading branch information...
1 parent ffb680e commit 28348e068151cd144da28a87d63853a328e393e7 @gaurish gaurish committed Aug 2, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/test/controller/live_stream_test.rb
View
2 actionpack/test/controller/live_stream_test.rb
@@ -135,7 +135,7 @@ def test_async_stream
@controller.process :blocking_stream
- assert t.join
+ assert t.join(3), 'timeout expired before the thread terminated'
end
def test_thread_locals_get_copied

0 comments on commit 28348e0

Please sign in to comment.
Something went wrong with that request. Please try again.