aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Strakhov <vl.strakhov@gmail.com>2012-07-28 20:12:35 +0400
committerVladimir Strakhov <vl.strakhov@gmail.com>2012-07-28 20:12:35 +0400
commit8b6301adbc8ceba9b796cf1748aac973aebcee46 (patch)
tree0608d508c39e253cd1891d70bb4c271edb312482
parent0cda0b3dbac13c9b60bbe508b130b9cb8a5071dd (diff)
downloadrails-8b6301adbc8ceba9b796cf1748aac973aebcee46.tar.gz
rails-8b6301adbc8ceba9b796cf1748aac973aebcee46.tar.bz2
rails-8b6301adbc8ceba9b796cf1748aac973aebcee46.zip
fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpack
-rw-r--r--actionpack/test/dispatch/response_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 500056b56b..51948a623c 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -7,11 +7,11 @@ class ResponseTest < ActiveSupport::TestCase
def test_can_wait_until_commit
t = Thread.new {
- assert @response.await_commit
+ @response.await_commit
}
@response.commit!
assert @response.committed?
- t.join
+ assert t.join(0.5)
end
def test_response_body_encoding