NetHttpPersistent: ConnectionError on OpenTimeout

  - open timeout is treated as a failure to connect
  - 4.0.0 and up supports this

Gemfile

@@ -23,7 +23,7 @@ group :test, :development do
   gem 'excon', '>= 0.27.4'
   gem 'httpclient', '>= 2.2'
   gem 'multipart-parser'
-  gem 'net-http-persistent'
+  gem 'net-http-persistent', '~> 4.0'
   gem 'patron', '>= 0.4.2', platforms: :ruby
   gem 'rack', '< 2.1'
   gem 'rack-test', '>= 0.6', require: 'rack/test'

lib/faraday/adapter/net_http_persistent.rb

@@ -53,6 +53,8 @@ def perform_request(http, env)
         http.request env[:url], create_request(env)
       rescue Errno::ETIMEDOUT => e
         raise Faraday::TimeoutError, e
+      rescue Net::OpenTimeout => e
+        raise Faraday::ConnectionFailed, e
       rescue Net::HTTP::Persistent::Error => e
         raise Faraday::TimeoutError, e if e.message.include? 'Timeout'
 

spec/support/shared_examples/request_method.rb

@@ -99,7 +99,7 @@
   it 'supports timeout option' do
     conn_options[:request] = { timeout: 1 }
     request_stub.to_timeout
-    exc = adapter == 'NetHttp' ? Faraday::ConnectionFailed : Faraday::TimeoutError
+    exc = ['NetHttp', 'NetHttpPersistent'].include?(adapter) ? Faraday::ConnectionFailed : Faraday::TimeoutError
     expect { conn.public_send(http_method, '/') }.to raise_error(exc)
   end
 
@@ -108,7 +108,7 @@
   it 'supports open_timeout option' do
     conn_options[:request] = { open_timeout: 1 }
     request_stub.to_timeout
-    exc = adapter == 'NetHttp' ? Faraday::ConnectionFailed : Faraday::TimeoutError
+    exc = ['NetHttp', 'NetHttpPersistent'].include?(adapter) ? Faraday::ConnectionFailed : Faraday::TimeoutError
     expect { conn.public_send(http_method, '/') }.to raise_error(exc)
   end