From 3fdff8fdaf0391bf6ba674ef6830ac498323b0f4 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 4 Dec 2016 21:28:57 +0900 Subject: test: call super from each test case's 'setup' method Just like we already do for 'teardown' method, though we don't have OpenSSL::TestCase#setup yet. This will be useful when we want to inject GC.stress = true. --- test/test_buffering.rb | 1 + test/test_config.rb | 1 + test/test_digest.rb | 1 + test/test_ns_spki.rb | 1 + test/test_ocsp.rb | 1 + test/test_pkcs12.rb | 1 + test/test_pkcs7.rb | 1 + test/test_x509cert.rb | 1 + test/test_x509crl.rb | 1 + test/test_x509ext.rb | 1 + test/test_x509name.rb | 1 + test/test_x509req.rb | 1 + test/test_x509store.rb | 1 + test/utils.rb | 1 + 14 files changed, 14 insertions(+) (limited to 'test') diff --git a/test/test_buffering.rb b/test/test_buffering.rb index 1f42cd3c..f85353fc 100644 --- a/test/test_buffering.rb +++ b/test/test_buffering.rb @@ -37,6 +37,7 @@ class OpenSSL::TestBuffering < OpenSSL::TestCase end def setup + super @io = IO.new end diff --git a/test/test_config.rb b/test/test_config.rb index 3e2e1273..786bce9d 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -3,6 +3,7 @@ require_relative 'utils' class OpenSSL::TestConfig < OpenSSL::TestCase def setup + super file = Tempfile.open("openssl.cnf") file << <<__EOD__ HOME = . diff --git a/test/test_digest.rb b/test/test_digest.rb index 028889c1..9891d99a 100644 --- a/test/test_digest.rb +++ b/test/test_digest.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestDigest < OpenSSL::TestCase def setup + super @d1 = OpenSSL::Digest.new("MD5") @d2 = OpenSSL::Digest::MD5.new end diff --git a/test/test_ns_spki.rb b/test/test_ns_spki.rb index 4740c0b2..ac34613f 100644 --- a/test/test_ns_spki.rb +++ b/test/test_ns_spki.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestNSSPI < OpenSSL::TestCase def setup + super # This request data is adopt from the specification of # "Netscape Extensions for User Key Generation". # -- http://wp.netscape.com/eng/security/comm4-keygen.html diff --git a/test/test_ocsp.rb b/test/test_ocsp.rb index 82d83d56..8881f25d 100644 --- a/test/test_ocsp.rb +++ b/test/test_ocsp.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestOCSP < OpenSSL::TestCase def setup + super # @ca_cert # | # @cert diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb index 8c9147a9..403718b9 100644 --- a/test/test_pkcs12.rb +++ b/test/test_pkcs12.rb @@ -8,6 +8,7 @@ module OpenSSL include OpenSSL::TestUtils def setup + super ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") ca_exts = [ ["basicConstraints","CA:TRUE",true], diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb index b7b75202..48d59997 100644 --- a/test/test_pkcs7.rb +++ b/test/test_pkcs7.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestPKCS7 < OpenSSL::TestCase def setup + super @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA") diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb index fb757c44..0cfe4402 100644 --- a/test/test_x509cert.rb +++ b/test/test_x509cert.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Certificate < OpenSSL::TestCase def setup + super @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb index f61de971..44dfffc9 100644 --- a/test/test_x509crl.rb +++ b/test/test_x509crl.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509CRL < OpenSSL::TestCase def setup + super @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 diff --git a/test/test_x509ext.rb b/test/test_x509ext.rb index 79713c0f..58f03168 100644 --- a/test/test_x509ext.rb +++ b/test/test_x509ext.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Extension < OpenSSL::TestCase def setup + super @basic_constraints_value = OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Boolean(true), # CA OpenSSL::ASN1::Integer(2) # pathlen diff --git a/test/test_x509name.rb b/test/test_x509name.rb index 78da4df1..b30a02e6 100644 --- a/test/test_x509name.rb +++ b/test/test_x509name.rb @@ -6,6 +6,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Name < OpenSSL::TestCase def setup + super @obj_type_tmpl = Hash.new(OpenSSL::ASN1::PRINTABLESTRING) @obj_type_tmpl.update(OpenSSL::X509::Name::OBJECT_TYPE_TEMPLATE) end diff --git a/test/test_x509req.rb b/test/test_x509req.rb index 086ccfbd..585dda1b 100644 --- a/test/test_x509req.rb +++ b/test/test_x509req.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Request < OpenSSL::TestCase def setup + super @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 diff --git a/test/test_x509store.rb b/test/test_x509store.rb index 6ca80c86..af0d8b28 100644 --- a/test/test_x509store.rb +++ b/test/test_x509store.rb @@ -5,6 +5,7 @@ if defined?(OpenSSL::TestUtils) class OpenSSL::TestX509Store < OpenSSL::TestCase def setup + super @rsa1024 = OpenSSL::TestUtils::TEST_KEY_RSA1024 @rsa2048 = OpenSSL::TestUtils::TEST_KEY_RSA2048 @dsa256 = OpenSSL::TestUtils::TEST_KEY_DSA256 diff --git a/test/utils.rb b/test/utils.rb index 43ecd79e..1be8db41 100644 --- a/test/utils.rb +++ b/test/utils.rb @@ -212,6 +212,7 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC ITERATIONS = ($0 == __FILE__) ? 100 : 10 def setup + super @ca_key = OpenSSL::TestUtils::TEST_KEY_RSA2048 @svr_key = OpenSSL::TestUtils::TEST_KEY_RSA1024 @cli_key = OpenSSL::TestUtils::TEST_KEY_DSA1024 -- cgit v1.2.3