Merge pull request rails#22038 from tgxworld/fix_random_error_when_ru…

…nning_tests_with_jruby FIX: Randomly failing test when running without GIL.
schneems · Oct 23, 2015 · 6f62ace · 6f62ace
2 parents e817196 + c285bbe
commit 6f62ace
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
@@ -388,8 +388,14 @@ def test_exception_handling_plain_text
     end
 
     def test_exception_callback_when_committed
+      current_threads = Thread.list
+
       capture_log_output do |output|
         get :exception_with_callback, format: 'text/event-stream'
+
+        # Wait on the execution of all threads
+        (Thread.list - current_threads).each(&:join)
+
         assert_equal %(data: "500 Internal Server Error"\n\n), response.body
         assert_match 'An exception occurred...', output.rewind && output.read
         assert_stream_closed