diff options
| author | Gaurish Sharma <contact@gaurishsharma.com> | 2013-08-02 20:27:28 +0530 |
|---|---|---|
| committer | Gaurish Sharma <contact@gaurishsharma.com> | 2013-08-02 20:27:28 +0530 |
| commit | 28348e068151cd144da28a87d63853a328e393e7 (patch) | |
| tree | 03f1b5a444a579387849851158b469bd58f489f2 /actionpack/test/controller/live_stream_test.rb | |
| parent | ffb680e121b1868c184381882b083290db230d78 (diff) | |
| download | rails-28348e068151cd144da28a87d63853a328e393e7.tar.gz rails-28348e068151cd144da28a87d63853a328e393e7.tar.bz2 rails-28348e068151cd144da28a87d63853a328e393e7.zip | |
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
Diffstat (limited to 'actionpack/test/controller/live_stream_test.rb')
| -rw-r--r-- | actionpack/test/controller/live_stream_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |