Merge pull request #1776 from DFE-Digital/dfe-healthcheck-timeouts

Rescue timeouts when health checking Redis

app/models/healthcheck.rb

@@ -18,7 +18,7 @@ def test_redis
     return nil unless ENV["REDIS_URL"]
 
     Redis.current.ping == "PONG"
-  rescue RuntimeError
+  rescue RuntimeError, Errno::ETIMEDOUT
     false
   end
 

spec/models/healthcheck_spec.rb

@@ -129,11 +129,12 @@
     end
 
     context "with broken connection" do
-      before do
-        allow(Redis).to receive(:current).and_raise Redis::CannotConnectError
+      it "returns false" do
+        [Errno::ETIMEDOUT, Redis::CannotConnectError].each do |error|
+          allow(Redis).to receive(:current).and_raise error
+          expect(subject).to be false
+        end
       end
-
-      it { is_expected.to be false }
     end
 
     context 'with non functional redis' do