Merge pull request #5207 from tgxworld/try_travis_fix

Fix randomly failing test.

config/database.yml

@@ -3,7 +3,7 @@ development:
   adapter: postgresql
   database: <%= ENV['DISCOURSE_DEV_DB'] || 'discourse_development' %>
   min_messages: warning
-  pool: 10
+  pool: 5
   timeout: 5000
   host_names:
     ### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings.
@@ -20,7 +20,7 @@ test:
   adapter: postgresql
   database: discourse_test<%= ENV['MULTISITE'] ? "_#{ENV['MULTISITE']}" : '' %>
   min_messages: warning
-  pool: 10
+  pool: 5
   timeout: 5000
   host_names:
     - test.localhost

config/sidekiq.yml

@@ -1,6 +1,6 @@
 ---
 development:
-  :concurrency: 5
+  :concurrency: 1
   :queues:
     - [critical,4]
     - [default, 2]

lib/active_record/connection_adapters/postgresql_fallback_adapter.rb

@@ -119,14 +119,7 @@ module ActiveRecord
 
     def verify_replica(connection)
       value = connection.raw_connection.exec("SELECT pg_is_in_recovery()").values[0][0]
-
+      raise "Replica database server is not in recovery mode." if !value
-      if !value
-        begin
-          raise "Replica database server is not in recovery mode."
-        ensure
-          connection.close
-        end
-      end
     end
   end
 end

spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb

@@ -94,15 +94,8 @@ describe ActiveRecord::ConnectionHandling do
         expect(postgresql_fallback_handler.master_down?).to eq(nil)
         expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0)
 
-        ActiveRecord::Base.clear_all_connections!
+        expect(ActiveRecord::Base.connection)
-        connection = ActiveRecord::Base.connection
+          .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-
-        begin
-          expect(connection)
-            .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-        ensure
-          connection.close
-        end
       end
     end