ruby-changes:18200
From: tenderlove <ko1@a...>
Date: Thu, 16 Dec 2010 04:50:10 +0900 (JST)
Subject: [ruby-changes:18200] Ruby:r30220 (trunk): drying up the requires in the openssl tests
tenderlove 2010-12-16 04:50:00 +0900 (Thu, 16 Dec 2010) New Revision: 30220 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30220 Log: drying up the requires in the openssl tests Modified files: trunk/test/openssl/test_bn.rb trunk/test/openssl/test_config.rb trunk/test/openssl/test_digest.rb trunk/test/openssl/test_ec.rb trunk/test/openssl/test_hmac.rb trunk/test/openssl/test_ns_spki.rb trunk/test/openssl/test_ocsp.rb trunk/test/openssl/test_pkcs7.rb trunk/test/openssl/test_pkey_rsa.rb trunk/test/openssl/test_ssl.rb trunk/test/openssl/test_x509cert.rb trunk/test/openssl/test_x509crl.rb trunk/test/openssl/test_x509ext.rb trunk/test/openssl/test_x509name.rb trunk/test/openssl/test_x509req.rb trunk/test/openssl/test_x509store.rb trunk/test/openssl/utils.rb Index: test/openssl/test_digest.rb =================================================================== --- test/openssl/test_digest.rb (revision 30219) +++ test/openssl/test_digest.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "digest/md5" -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) Index: test/openssl/test_x509store.rb =================================================================== --- test/openssl/test_x509store.rb (revision 30219) +++ test/openssl/test_x509store.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) Index: test/openssl/test_x509cert.rb =================================================================== --- test/openssl/test_x509cert.rb (revision 30219) +++ test/openssl/test_x509cert.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) Index: test/openssl/test_x509ext.rb =================================================================== --- test/openssl/test_x509ext.rb (revision 30219) +++ test/openssl/test_x509ext.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) Index: test/openssl/test_ec.rb =================================================================== --- test/openssl/test_ec.rb (revision 30219) +++ test/openssl/test_ec.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL::PKey::EC) Index: test/openssl/test_pkcs7.rb =================================================================== --- test/openssl/test_pkcs7.rb (revision 30219) +++ test/openssl/test_pkcs7.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative 'utils' -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) Index: test/openssl/test_bn.rb =================================================================== --- test/openssl/test_bn.rb (revision 30219) +++ test/openssl/test_bn.rb (revision 30220) @@ -1,5 +1,4 @@ require_relative 'utils' -require "digest/md5" if defined?(OpenSSL) Index: test/openssl/utils.rb =================================================================== --- test/openssl/utils.rb (revision 30219) +++ test/openssl/utils.rb (revision 30220) @@ -3,6 +3,11 @@ rescue LoadError end require "test/unit" +require "digest/md5" +require 'tempfile' +require "rbconfig" +require "socket" +require_relative '../ruby/envutil' module OpenSSL::TestUtils TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_ Index: test/openssl/test_ssl.rb =================================================================== --- test/openssl/test_ssl.rb (revision 30219) +++ test/openssl/test_ssl.rb (revision 30220) @@ -1,12 +1,4 @@ -begin - require "openssl" - require_relative "utils.rb" -rescue LoadError -end -require "rbconfig" -require "socket" -require "test/unit" -require_relative '../ruby/envutil' +require_relative "utils" if defined?(OpenSSL) Index: test/openssl/test_ocsp.rb =================================================================== --- test/openssl/test_ocsp.rb (revision 30219) +++ test/openssl/test_ocsp.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) Index: test/openssl/test_config.rb =================================================================== --- test/openssl/test_config.rb (revision 30219) +++ test/openssl/test_config.rb (revision 30220) @@ -1,7 +1,4 @@ -require 'openssl' -require "test/unit" -require 'tempfile' -require File.join(File.dirname(__FILE__), "utils.rb") +require_relative 'utils' class OpenSSL::TestConfig < Test::Unit::TestCase def setup Index: test/openssl/test_ns_spki.rb =================================================================== --- test/openssl/test_ns_spki.rb (revision 30219) +++ test/openssl/test_ns_spki.rb (revision 30220) @@ -1,13 +1,7 @@ -begin - require "openssl" - require_relative 'utils' -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) - class OpenSSL::TestNSSPI < Test::Unit::TestCase def setup # This request data is adopt from the specification of @@ -20,9 +14,6 @@ @b64 << "i0//rgBvmco=" end - def teardown - end - def test_build_data key1 = OpenSSL::TestUtils::TEST_KEY_RSA1024 key2 = OpenSSL::TestUtils::TEST_KEY_RSA2048 Index: test/openssl/test_x509crl.rb =================================================================== --- test/openssl/test_x509crl.rb (revision 30219) +++ test/openssl/test_x509crl.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) Index: test/openssl/test_x509name.rb =================================================================== --- test/openssl/test_x509name.rb (revision 30219) +++ test/openssl/test_x509name.rb (revision 30220) @@ -1,8 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) Index: test/openssl/test_hmac.rb =================================================================== --- test/openssl/test_hmac.rb (revision 30219) +++ test/openssl/test_hmac.rb (revision 30220) @@ -1,8 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "test/unit" +require_relative 'utils' class OpenSSL::TestHMAC < Test::Unit::TestCase def setup Index: test/openssl/test_pkey_rsa.rb =================================================================== --- test/openssl/test_pkey_rsa.rb (revision 30219) +++ test/openssl/test_pkey_rsa.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require 'test/unit' +require_relative 'utils' if defined?(OpenSSL) Index: test/openssl/test_x509req.rb =================================================================== --- test/openssl/test_x509req.rb (revision 30219) +++ test/openssl/test_x509req.rb (revision 30220) @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/