From fc446ac016c20d70db05f49ef89683a4c4df1757 Mon Sep 17 00:00:00 2001 From: shugo Date: Sat, 19 Nov 2016 02:37:39 +0000 Subject: [PATCH] Move certificates to test/net/fixtures/. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/net/{imap => fixtures}/cacert.pem | 0 test/net/{imap => fixtures}/server.crt | 0 test/net/{imap => fixtures}/server.key | 0 test/net/ftp/test_ftp.rb | 6 +++--- test/net/imap/test_imap.rb | 6 +++--- test/net/smtp/test_smtp.rb | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) rename test/net/{imap => fixtures}/cacert.pem (100%) rename test/net/{imap => fixtures}/server.crt (100%) rename test/net/{imap => fixtures}/server.key (100%) diff --git a/test/net/imap/cacert.pem b/test/net/fixtures/cacert.pem similarity index 100% rename from test/net/imap/cacert.pem rename to test/net/fixtures/cacert.pem diff --git a/test/net/imap/server.crt b/test/net/fixtures/server.crt similarity index 100% rename from test/net/imap/server.crt rename to test/net/fixtures/server.crt diff --git a/test/net/imap/server.key b/test/net/fixtures/server.key similarity index 100% rename from test/net/imap/server.key rename to test/net/fixtures/server.key diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index 4394808075..f514efb182 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -8,9 +8,9 @@ require "tempfile" class FTPTest < Test::Unit::TestCase SERVER_ADDR = "127.0.0.1" - CA_FILE = File.expand_path("../imap/cacert.pem", __dir__) - SERVER_KEY = File.expand_path("../imap/server.key", __dir__) - SERVER_CERT = File.expand_path("../imap/server.crt", __dir__) + CA_FILE = File.expand_path("../fixtures/cacert.pem", __dir__) + SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__) + SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__) def setup @thread = nil diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index cdd9323c10..35e5ed8982 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -4,9 +4,9 @@ require "net/imap" require "test/unit" class IMAPTest < Test::Unit::TestCase - CA_FILE = File.expand_path("cacert.pem", File.dirname(__FILE__)) - SERVER_KEY = File.expand_path("server.key", File.dirname(__FILE__)) - SERVER_CERT = File.expand_path("server.crt", File.dirname(__FILE__)) + CA_FILE = File.expand_path("../fixtures/cacert.pem", __dir__) + SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__) + SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__) SERVER_ADDR = "127.0.0.1" diff --git a/test/net/smtp/test_smtp.rb b/test/net/smtp/test_smtp.rb index bf25af5b58..01b8ae504c 100644 --- a/test/net/smtp/test_smtp.rb +++ b/test/net/smtp/test_smtp.rb @@ -5,9 +5,9 @@ require 'test/unit' module Net class TestSMTP < Test::Unit::TestCase - CA_FILE = File.expand_path("../imap/cacert.pem", __dir__) - SERVER_KEY = File.expand_path("../imap/server.key", __dir__) - SERVER_CERT = File.expand_path("../imap/server.crt", __dir__) + CA_FILE = File.expand_path("../fixtures/cacert.pem", __dir__) + SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__) + SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__) class FakeSocket attr_reader :write_io