aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-22 05:48:44 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-22 05:48:44 +0000
commit914a4a025a493c17bba8262d1a13d6da2cef662f (patch)
treea5652683a9178feb3ece6636d1c8ab2634daa2f8
parentbda678dc5b8533d7161b1021230b9732acaab0c5 (diff)
downloadruby-914a4a025a493c17bba8262d1a13d6da2cef662f.tar.gz
* test/openssl/test_buffering.rb
* test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase instead of Mintest::Unit::TestCase. [ruby-core:37275] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/openssl/test_buffering.rb3
-rw-r--r--test/openssl/test_pkcs12.rb2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ce655e827..eaaabb4f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 22 14:47:53 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * test/openssl/test_buffering.rb
+ * test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
+ instead of Mintest::Unit::TestCase. [ruby-core:37275]
+
Wed Jun 22 12:41:03 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb
index 25e0b66232..1e2197533a 100644
--- a/test/openssl/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
@@ -1,8 +1,7 @@
require_relative 'utils'
require 'stringio'
-require 'minitest/unit'
-class OpenSSL::TestBuffering < MiniTest::Unit::TestCase
+class OpenSSL::TestBuffering < Test::Unit::TestCase
class IO
include OpenSSL::Buffering
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index 223497d9f1..8b8acfef09 100644
--- a/test/openssl/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
@@ -3,7 +3,7 @@ require_relative "utils"
if defined?(OpenSSL)
module OpenSSL
- class TestPKCS12 < MiniTest::Unit::TestCase
+ class TestPKCS12 < Test::Unit::TestCase
include OpenSSL::TestUtils
def setup