Skip to content
This repository
Browse code

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...
commit 28348e068151cd144da28a87d63853a328e393e7 1 parent ffb680e
Gaurish Sharma gaurish authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  actionpack/test/controller/live_stream_test.rb
2  actionpack/test/controller/live_stream_test.rb
@@ -135,7 +135,7 @@ def test_async_stream
135 135
136 136 @controller.process :blocking_stream
137 137
138   - assert t.join
  138 + assert t.join(3), 'timeout expired before the thread terminated'
139 139 end
140 140
141 141 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.