summaryrefslogtreecommitdiff
path: root/test/net
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-02-21 21:21:14 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-02-21 21:21:14 +0900
commit9cb1ffaa5c3a4b6921eaf748ffdef5dbd1c07877 (patch)
treeffca3f9ceb7b0a56fd546a7b62780f98011a8265 /test/net
parenta294ec162235cb9a0ed62ede0bbf9d2f11b30592 (diff)
Promote net-http to the default gems.
test/net/http/test_https.rb: rename fixture methods to read_fixture because it conflicts with test-unit gem.
Diffstat (limited to 'test/net')
-rw-r--r--test/net/http/test_https.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
index 204bfb7ad3..64101b6bda 100644
--- a/test/net/http/test_https.rb
+++ b/test/net/http/test_https.rb
@@ -12,14 +12,14 @@ end
class TestNetHTTPS < Test::Unit::TestCase
include TestNetHTTPUtils
- def self.fixture(key)
+ def self.read_fixture(key)
File.read(File.expand_path("../fixtures/#{key}", __dir__))
end
- CA_CERT = OpenSSL::X509::Certificate.new(fixture("cacert.pem"))
- SERVER_KEY = OpenSSL::PKey.read(fixture("server.key"))
- SERVER_CERT = OpenSSL::X509::Certificate.new(fixture("server.crt"))
- DHPARAMS = OpenSSL::PKey::DH.new(fixture("dhparams.pem"))
+ CA_CERT = OpenSSL::X509::Certificate.new(read_fixture("cacert.pem"))
+ SERVER_KEY = OpenSSL::PKey.read(read_fixture("server.key"))
+ SERVER_CERT = OpenSSL::X509::Certificate.new(read_fixture("server.crt"))
+ DHPARAMS = OpenSSL::PKey::DH.new(read_fixture("dhparams.pem"))
TEST_STORE = OpenSSL::X509::Store.new.tap {|s| s.add_cert(CA_CERT) }
CONFIG = {