ruby-changes:36742
From: nobu <ko1@a...>
Date: Sat, 13 Dec 2014 12:06:01 +0900 (JST)
Subject: [ruby-changes:36742] nobu:r48823 (trunk): test/openssl: skip old OpenSSL
nobu 2014-12-13 12:05:43 +0900 (Sat, 13 Dec 2014) New Revision: 48823 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48823 Log: test/openssl: skip old OpenSSL * test/openssl/utils.rb (OpenSSL::TestUtils): ignore out-of-date OpenSSL before 1.0. Modified files: trunk/test/openssl/test_asn1.rb trunk/test/openssl/test_bn.rb trunk/test/openssl/test_buffering.rb trunk/test/openssl/test_cipher.rb trunk/test/openssl/test_config.rb trunk/test/openssl/test_digest.rb trunk/test/openssl/test_engine.rb trunk/test/openssl/test_fips.rb trunk/test/openssl/test_hmac.rb trunk/test/openssl/test_ns_spki.rb trunk/test/openssl/test_ocsp.rb trunk/test/openssl/test_pair.rb trunk/test/openssl/test_partial_record_read.rb trunk/test/openssl/test_pkcs12.rb trunk/test/openssl/test_pkcs5.rb trunk/test/openssl/test_pkcs7.rb trunk/test/openssl/test_pkey_dh.rb trunk/test/openssl/test_pkey_dsa.rb trunk/test/openssl/test_pkey_rsa.rb trunk/test/openssl/test_ssl.rb trunk/test/openssl/test_ssl_session.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 48822) +++ test/openssl/test_digest.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_digest.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestDigest < Test::Unit::TestCase def setup Index: test/openssl/test_x509store.rb =================================================================== --- test/openssl/test_x509store.rb (revision 48822) +++ test/openssl/test_x509store.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509store.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Store < Test::Unit::TestCase def setup Index: test/openssl/test_x509cert.rb =================================================================== --- test/openssl/test_x509cert.rb (revision 48822) +++ test/openssl/test_x509cert.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509cert.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Certificate < Test::Unit::TestCase def setup Index: test/openssl/test_pkey_dh.rb =================================================================== --- test/openssl/test_pkey_dh.rb (revision 48822) +++ test/openssl/test_pkey_dh.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkey_dh.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyDH < Test::Unit::TestCase Index: test/openssl/test_partial_record_read.rb =================================================================== --- test/openssl/test_partial_record_read.rb (revision 48822) +++ test/openssl/test_partial_record_read.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_partial_record_read.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPartialRecordRead < OpenSSL::SSLTestCase def test_partial_tls_record_read_nonblock Index: test/openssl/test_pkcs5.rb =================================================================== --- test/openssl/test_pkcs5.rb (revision 48822) +++ test/openssl/test_pkcs5.rb (revision 48823) @@ -94,4 +94,4 @@ class OpenSSL::TestPKCS5 < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkcs5.rb#L94 assert_equal(value1, value2) end if OpenSSL::PKCS5.respond_to?(:pbkdf2_hmac) -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_x509ext.rb =================================================================== --- test/openssl/test_x509ext.rb (revision 48822) +++ test/openssl/test_x509ext.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509ext.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Extension < Test::Unit::TestCase def setup Index: test/openssl/test_pkcs7.rb =================================================================== --- test/openssl/test_pkcs7.rb (revision 48822) +++ test/openssl/test_pkcs7.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkcs7.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKCS7 < Test::Unit::TestCase def setup Index: test/openssl/test_pair.rb =================================================================== --- test/openssl/test_pair.rb (revision 48822) +++ test/openssl/test_pair.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pair.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) require 'socket' require_relative '../ruby/ut_eof' Index: test/openssl/test_pkey_dsa.rb =================================================================== --- test/openssl/test_pkey_dsa.rb (revision 48822) +++ test/openssl/test_pkey_dsa.rb (revision 48823) @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkey_dsa.rb#L1 require_relative 'utils' require 'base64' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyDSA < Test::Unit::TestCase def test_private Index: test/openssl/test_bn.rb =================================================================== --- test/openssl/test_bn.rb (revision 48822) +++ test/openssl/test_bn.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_bn.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestBN < Test::Unit::TestCase def test_new_str Index: test/openssl/utils.rb =================================================================== --- test/openssl/utils.rb (revision 48822) +++ test/openssl/utils.rb (revision 48823) @@ -327,4 +327,5 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOP https://github.com/ruby/ruby/blob/trunk/test/openssl/utils.rb#L327 end end -end if defined?(OpenSSL) +end if defined?(OpenSSL::OPENSSL_LIBRARY_VERSION) and + /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION Index: test/openssl/test_ssl.rb =================================================================== --- test/openssl/test_ssl.rb (revision 48822) +++ test/openssl/test_ssl.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestSSL < OpenSSL::SSLTestCase Index: test/openssl/test_fips.rb =================================================================== --- test/openssl/test_fips.rb (revision 48822) +++ test/openssl/test_fips.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_fips.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestFIPS < Test::Unit::TestCase Index: test/openssl/test_asn1.rb =================================================================== --- test/openssl/test_asn1.rb (revision 48822) +++ test/openssl/test_asn1.rb (revision 48823) @@ -605,5 +605,5 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoo https://github.com/ruby/ruby/blob/trunk/test/openssl/test_asn1.rb#L605 assert_equal(:UNIVERSAL, asn1.tag_class) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_pkcs12.rb =================================================================== --- test/openssl/test_pkcs12.rb (revision 48822) +++ test/openssl/test_pkcs12.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkcs12.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) module OpenSSL class TestPKCS12 < Test::Unit::TestCase Index: test/openssl/test_ocsp.rb =================================================================== --- test/openssl/test_ocsp.rb (revision 48822) +++ test/openssl/test_ocsp.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ocsp.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestOCSP < Test::Unit::TestCase def setup Index: test/openssl/test_ssl_session.rb =================================================================== --- test/openssl/test_ssl_session.rb (revision 48822) +++ test/openssl/test_ssl_session.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl_session.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase def test_session_equals Index: test/openssl/test_engine.rb =================================================================== --- test/openssl/test_engine.rb (revision 48822) +++ test/openssl/test_engine.rb (revision 48823) @@ -71,5 +71,5 @@ class OpenSSL::TestEngine < Test::Unit:: https://github.com/ruby/ruby/blob/trunk/test/openssl/test_engine.rb#L71 cipher.update(data) + cipher.final end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_config.rb =================================================================== --- test/openssl/test_config.rb (revision 48822) +++ test/openssl/test_config.rb (revision 48823) @@ -294,4 +294,4 @@ __EOC__ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_config.rb#L294 @it['newsection'] = {'a' => 'b'} assert_not_equal(@it.sections.sort, c.sections.sort) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_ns_spki.rb =================================================================== --- test/openssl/test_ns_spki.rb (revision 48822) +++ test/openssl/test_ns_spki.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ns_spki.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestNSSPI < Test::Unit::TestCase def setup Index: test/openssl/test_x509crl.rb =================================================================== --- test/openssl/test_x509crl.rb (revision 48822) +++ test/openssl/test_x509crl.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509crl.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509CRL < Test::Unit::TestCase def setup Index: test/openssl/test_x509name.rb =================================================================== --- test/openssl/test_x509name.rb (revision 48822) +++ test/openssl/test_x509name.rb (revision 48823) @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509name.rb#L1 # coding: US-ASCII require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Name < Test::Unit::TestCase OpenSSL::ASN1::ObjectId.register( Index: test/openssl/test_buffering.rb =================================================================== --- test/openssl/test_buffering.rb (revision 48822) +++ test/openssl/test_buffering.rb (revision 48823) @@ -84,4 +84,4 @@ class OpenSSL::TestBuffering < Test::Uni https://github.com/ruby/ruby/blob/trunk/test/openssl/test_buffering.rb#L84 assert_equal([97, 98, 99], res) end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_hmac.rb =================================================================== --- test/openssl/test_hmac.rb (revision 48822) +++ test/openssl/test_hmac.rb (revision 48823) @@ -38,4 +38,4 @@ class OpenSSL::TestHMAC < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/openssl/test_hmac.rb#L38 result = hmac.update(data).hexdigest assert_equal "a13984b929a07912e4e21c5720876a8e150d6f67f854437206e7f86547248396", result end -end if defined?(OpenSSL) +end if defined?(OpenSSL::TestUtils) Index: test/openssl/test_cipher.rb =================================================================== --- test/openssl/test_cipher.rb (revision 48822) +++ test/openssl/test_cipher.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_cipher.rb#L1 require_relative 'utils' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestCipher < Test::Unit::TestCase Index: test/openssl/test_pkey_rsa.rb =================================================================== --- test/openssl/test_pkey_rsa.rb (revision 48822) +++ test/openssl/test_pkey_rsa.rb (revision 48823) @@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_pkey_rsa.rb#L1 require_relative 'utils' require 'base64' -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKeyRSA < Test::Unit::TestCase def test_padding Index: test/openssl/test_x509req.rb =================================================================== --- test/openssl/test_x509req.rb (revision 48822) +++ test/openssl/test_x509req.rb (revision 48823) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/test/openssl/test_x509req.rb#L1 require_relative "utils" -if defined?(OpenSSL) +if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Request < Test::Unit::TestCase def setup -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/