1 files changed, 15 insertions, 14 deletions
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index fff5904aba..50e621f22b 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -1,20 +1,21 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'net/http'
-require 'rubygems/openssl'
+
+require_relative "helper"
+require "rubygems/vendored_net_http"
+require "rubygems/openssl"
 
 unless Gem::HAVE_OPENSSL
-  warn 'Skipping bundled certificates tests.  openssl not found.'
+  warn "Skipping bundled certificates tests.  openssl not found."
 end
 
-require 'rubygems/request'
+require "rubygems/request"
 
 # = Testing Bundled CA
 #
 # The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
 
-class TestBundledCA < Gem::TestCase
+class TestGemBundledCA < Gem::TestCase
   def bundled_certificate_store
     store = OpenSSL::X509::Store.new
 
@@ -27,34 +28,34 @@ class TestBundledCA < Gem::TestCase
 
   def assert_https(host)
     assert true
-    http = Net::HTTP.new(host, 443)
+    http = Gem::Net::HTTP.new(host, 443)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     http.cert_store = bundled_certificate_store
-    http.get('/')
-  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
+    http.get("/")
+  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError, Net::OpenTimeout
     pend "#{host} seems offline, I can't tell whether ssl would work."
   rescue OpenSSL::SSL::SSLError => e
     # Only fail for certificate verification errors
-    if e.message =~ /certificate verify failed/
+    if e.message.include?("certificate verify failed")
       flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
     end
     raise
   end
 
   def test_accessing_rubygems
-    assert_https('rubygems.org')
+    assert_https("rubygems.org")
   end
 
   def test_accessing_www_rubygems
-    assert_https('www.rubygems.org')
+    assert_https("www.rubygems.org")
   end
 
   def test_accessing_staging
-    assert_https('staging.rubygems.org')
+    assert_https("staging.rubygems.org")
   end
 
   def test_accessing_new_index
-    assert_https('index.rubygems.org')
+    assert_https("index.rubygems.org")
   end
 end if Gem::HAVE_OPENSSL