aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-02-28 16:35:23 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-02-28 16:35:33 -0800
commit401787db4bc428dce88b04e343a64c6a6c3b681c (patch)
tree02e15fec4c532199667ead5377e3377d1ce51af4
parentb0767afac5390cb885c8274e78d5b7fa8bf7e157 (diff)
downloadrails-401787db4bc428dce88b04e343a64c6a6c3b681c.tar.gz
rails-401787db4bc428dce88b04e343a64c6a6c3b681c.tar.bz2
rails-401787db4bc428dce88b04e343a64c6a6c3b681c.zip
make sure we wait for the threads to shut down before asserting closure
-rw-r--r--actionpack/test/controller/live_stream_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index d1025042df..eb8b2c9832 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -180,6 +180,7 @@ module ActionController
tests TestController
def assert_stream_closed
+ response.stream.await_close
assert response.stream.closed?, 'stream should be closed'
end