From baf5f47b8768c7ec0164ed5ab60e369cdd936d71 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 30 Aug 2013 19:36:41 -0700
Subject: reconnect after the fork returns

---
 activerecord/test/cases/base_test.rb | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v1.2.3