Merge 59817096-ENETUNREACH to master

Glyn Normington · Glyn Normington · commit 70d4e13fff18 · 2013-10-30T10:12:55.000Z
[Completes #59817096]
diff --git a/lib/java_buildpack/util/download_cache.rb b/lib/java_buildpack/util/download_cache.rb
@@ -105,10 +105,17 @@ def evict(uri)
 
     HTTP_ERRORS = [
         EOFError,
+        Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
         Errno::ECONNRESET,
+        Errno::EHOSTDOWN,
         Errno::EHOSTUNREACH,
         Errno::EINVAL,
+        Errno::ENETDOWN,
+        Errno::ENETRESET,
+        Errno::ENETUNREACH,
+        Errno::ENONET,
+        Errno::ENOTCONN,
         Errno::EPIPE,
         Errno::ETIMEDOUT,
         Net::HTTPBadResponse,
diff --git a/spec/java_buildpack/util/download_cache_spec.rb b/spec/java_buildpack/util/download_cache_spec.rb
@@ -355,6 +355,23 @@ def suppress_internet_availability_check
       end
     end
 
+    it 'should use the buildpack cache if the download cannot be completed because Errno::ENETUNREACH is raised' do
+      stub_request(:get, 'http://foo-uri/').to_raise(Errno::ENETUNREACH)
+
+      Dir.mktmpdir do |root|
+        Dir.mktmpdir do |buildpack_cache|
+          java_buildpack_cache = File.join(buildpack_cache, 'java-buildpack')
+          FileUtils.mkdir_p java_buildpack_cache
+          touch java_buildpack_cache, 'cached', 'foo-stashed'
+          with_buildpack_cache(buildpack_cache) do
+            DownloadCache.new(root).get('http://foo-uri/') do |file|
+              expect(file.read).to eq('foo-stashed')
+            end
+          end
+        end
+      end
+    end
+
     it 'should use the buildpack cache if the cache configuration disables remote downloads' do
       YAML.stub(:load_file).with(File.expand_path('config/cache.yml')).and_return(
           'remote_downloads' => 'disabled')
