Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5287 from tgxworld/fix_randomly_failing_test 

Clear all active connections after PostgreSQL failover tests.
This commit is contained in:
Guo Xiang Tan 2017-11-03 10:03:57 +08:00 committed by GitHub
parent 88ef531202 af01860a3d
commit 3c8a48f768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
View File

@ -36,6 +36,7 @@ describe ActiveRecord::ConnectionHandling do
after do after do
postgresql_fallback_handler.setup! postgresql_fallback_handler.setup!
postgresql_fallback_handler.clear_connections
end end
describe "#postgresql_fallback_connection" do describe "#postgresql_fallback_connection" do
@ -118,8 +119,6 @@ describe ActiveRecord::ConnectionHandling do
expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0) expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0)
expect(postgresql_fallback_handler.master_down?).to eq(nil) expect(postgresql_fallback_handler.master_down?).to eq(nil)
skip("Only fails on Travis")
expect(ActiveRecord::Base.connection) expect(ActiveRecord::Base.connection)
.to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
end end