aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2019-02-12 12:26:09 -0500
committereileencodes <eileencodes@gmail.com>2019-02-12 12:26:09 -0500
commit32bd378821f87045e12e515695ddaaa5b9ffda3e (patch)
tree6bc76bfa58cdc036126de71969835f9c4b4e5176 /activerecord
parent1bbf08bb497a022f94c7309e0525071b1a65e272 (diff)
downloadrails-32bd378821f87045e12e515695ddaaa5b9ffda3e.tar.gz
rails-32bd378821f87045e12e515695ddaaa5b9ffda3e.tar.bz2
rails-32bd378821f87045e12e515695ddaaa5b9ffda3e.zip
Fix DatabaseSelector test that fails sometimes
On CI we've seen a few test failures when the DatabaseSelectorTest runs before the ConnectionHandlersMultiDbTest. This is because it's creating 2 handlers but not properly tearing them down. Example failure: ``` Failure: ActiveRecord::ConnectionAdapters::ConnectionHandlersMultiDbTest#test_connects_to_with_single_configuration [/rails/activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb:241]: Expected: 1 Actual: 2 ```
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/database_selector_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/database_selector_test.rb b/activerecord/test/cases/database_selector_test.rb
index 4106a6ec46..fd02d2acb4 100644
--- a/activerecord/test/cases/database_selector_test.rb
+++ b/activerecord/test/cases/database_selector_test.rb
@@ -11,6 +11,10 @@ module ActiveRecord
@session = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session.new(@session_store)
end
+ teardown do
+ ActiveRecord::Base.connection_handlers = { writing: ActiveRecord::Base.default_connection_handler }
+ end
+
def test_empty_session
assert_equal Time.at(0), @session.last_write_timestamp
end