From b636e858bb8dacef465c0237ad28cbc07ccbf84c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 26 Oct 2017 16:37:41 +0800 Subject: [PATCH] Fix randomly failing spec on Travis. --- .../postgresql_fallback_adapter_spec.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb index f5669d1eeb3..7262deb2edd 100644 --- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb +++ b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb @@ -105,21 +105,18 @@ describe ActiveRecord::ConnectionHandling do expect(postgresql_fallback_handler.master_down?).to eq(true) ensure postgresql_fallback_handler.master_up(multisite_db) + expect(postgresql_fallback_handler.master_down?).to eq(nil) end end - expect(postgresql_fallback_handler.masters_down.hash).to eq( - "default" => true - ) - ActiveRecord::Base.unstub(:postgresql_connection) postgresql_fallback_handler.initiate_fallback_to_master expect(Discourse.readonly_mode?).to eq(false) - expect(postgresql_fallback_handler.masters_down.hash).to eq({}) expect(Sidekiq.paused?).to eq(false) expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0) + expect(postgresql_fallback_handler.master_down?).to eq(nil) expect(ActiveRecord::Base.connection) .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)