diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-08-02 15:19:33 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-08-02 15:19:33 -0700 |
| commit | 77384c86f9c6ded662cea68b35d0a53c4f609aa1 (patch) | |
| tree | a9032aa6ad948ccd368485307a0ca9e6bb4c3982 | |
| parent | bf520b1dfb32c53a08802f2d32364441f0c4cf4e (diff) | |
| parent | 28348e068151cd144da28a87d63853a328e393e7 (diff) | |
| download | rails-77384c86f9c6ded662cea68b35d0a53c4f609aa1.tar.gz rails-77384c86f9c6ded662cea68b35d0a53c4f609aa1.tar.bz2 rails-77384c86f9c6ded662cea68b35d0a53c4f609aa1.zip | |
Merge pull request #11721 from gaurish/join-timeout
Add timeout to test_async_stream
| -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 |