aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-08-30 19:36:41 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-08-30 19:36:41 -0700
commitbaf5f47b8768c7ec0164ed5ab60e369cdd936d71 (patch)
tree6f4c4fb5df2b632cfe52248d6e41a9a4eb292fc3 /activerecord/test
parentfcb92882b12a4a79a5c2901062cef009ec5f2fdc (diff)
downloadrails-baf5f47b8768c7ec0164ed5ab60e369cdd936d71.tar.gz
rails-baf5f47b8768c7ec0164ed5ab60e369cdd936d71.tar.bz2
rails-baf5f47b8768c7ec0164ed5ab60e369cdd936d71.zip
reconnect after the fork returns
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/base_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index de4b7fa687..6fb046a44e 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1348,6 +1348,8 @@ class BasicsTest < ActiveRecord::TestCase
wr.close
assert Marshal.load rd.read
rd.close
+ ensure
+ ActiveRecord::Base.connection.reconnect!
end
def test_marshalling_new_record_round_trip_with_associations