From 6988d86035f8063bd3c1228573523ed700405cf5 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Wed, 19 May 2004 18:30:52 +0000 Subject: * rescue LoadError. [ruby-dev:23539] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_x509cert.rb | 11 +++++++++-- test/openssl/test_x509crl.rb | 11 +++++++++-- test/openssl/test_x509name.rb | 9 ++++++++- test/openssl/test_x509req.rb | 11 +++++++++-- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/test/openssl/test_x509cert.rb b/test/openssl/test_x509cert.rb index 66dd84c245..a5a75ff1b6 100644 --- a/test/openssl/test_x509cert.rb +++ b/test/openssl/test_x509cert.rb @@ -1,6 +1,11 @@ -require "openssl" +begin + require "openssl" + require File.join(File.dirname(__FILE__), "utils.rb") +rescue LoadError +end require "test/unit" -require File.join(File.dirname(__FILE__), "utils.rb") + +if defined?(OpenSSL) class OpenSSL::TestX509Certificate < Test::Unit::TestCase def setup @@ -166,3 +171,5 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase } end end + +end diff --git a/test/openssl/test_x509crl.rb b/test/openssl/test_x509crl.rb index 201a79e503..64d895f0f5 100644 --- a/test/openssl/test_x509crl.rb +++ b/test/openssl/test_x509crl.rb @@ -1,6 +1,11 @@ -require "openssl" +begin + require "openssl" + require File.join(File.dirname(__FILE__), "utils.rb") +rescue LoadError +end require "test/unit" -require File.join(File.dirname(__FILE__), "utils.rb") + +if defined?(OpenSSL) class OpenSSL::TestX509CRL < Test::Unit::TestCase def setup @@ -207,3 +212,5 @@ class OpenSSL::TestX509CRL < Test::Unit::TestCase assert_equal(false, crl.verify(@dsa512)) end end + +end diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb index 85cc5ca2f9..0fbe2c2569 100644 --- a/test/openssl/test_x509name.rb +++ b/test/openssl/test_x509name.rb @@ -1,6 +1,11 @@ -require "openssl" +begin + require "openssl" +rescue LoadError +end require "test/unit" +if defined?(OpenSSL) + class OpenSSL::TestX509Name < Test::Unit::TestCase def setup @obj_type_tmpl = Hash.new(OpenSSL::ASN1::PRINTABLESTRING) @@ -153,3 +158,5 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[4][2]) end end + +end diff --git a/test/openssl/test_x509req.rb b/test/openssl/test_x509req.rb index 6f0f8bac6d..a37ed5c5ef 100644 --- a/test/openssl/test_x509req.rb +++ b/test/openssl/test_x509req.rb @@ -1,6 +1,11 @@ -require "openssl" +begin + require "openssl" + require File.join(File.dirname(__FILE__), "utils.rb") +rescue LoadError +end require "test/unit" -require File.join(File.dirname(__FILE__), "utils.rb") + +if defined?(OpenSSL) class OpenSSL::TestX509Request < Test::Unit::TestCase def setup @@ -131,3 +136,5 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) } end end + +end -- cgit v1.2.3