Upstream ruby/ruby@ae042f2 from r50727

5 files changed, 7 insertions, 7 deletions

diff --git a/test/test_asn1.rb b/test/test_asn1.rb
index 9fb5a551..8955d727 100644
--- a/test/test_asn1.rb
+++ b/test/test_asn1.rb
@@ -552,7 +552,7 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
   end
 
   def test_primitive_inf_length
-    assert_raises(OpenSSL::ASN1::ASN1Error) do
+    assert_raise(OpenSSL::ASN1::ASN1Error) do
       spec = %w{ 02 80 02 01 01 00 00 }
       raw = [spec.join('')].pack('H*')
       OpenSSL::ASN1.decode(raw)
diff --git a/test/test_buffering.rb b/test/test_buffering.rb
index c62dd4d1..0ca64599 100644
--- a/test/test_buffering.rb
+++ b/test/test_buffering.rb
@@ -61,7 +61,7 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase
       raise SystemCallError, 'fail'
     end
 
-    assert_raises SystemCallError do
+    assert_raise SystemCallError do
       @io.flush
     end
 
diff --git a/test/test_digest.rb b/test/test_digest.rb
index a23b2ef0..5390225f 100644
--- a/test/test_digest.rb
+++ b/test/test_digest.rb
@@ -106,7 +106,7 @@ class OpenSSL::TestDigest < Test::Unit::TestCase
   def test_openssl_digest
     assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
 
-    assert_raises NameError do
+    assert_raise NameError do
       OpenSSL::Digest("no such digest")
     end
   end
diff --git a/test/test_pkcs12.rb b/test/test_pkcs12.rb
index 4e379041..c44cee00 100644
--- a/test/test_pkcs12.rb
+++ b/test/test_pkcs12.rb
@@ -113,7 +113,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
     end
 
     def test_create_with_bad_nid
-      assert_raises(ArgumentError) do
+      assert_raise(ArgumentError) do
         OpenSSL::PKCS12.create(
           "omg",
           "hello",
@@ -137,7 +137,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
         2048
       )
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         OpenSSL::PKCS12.create(
           "omg",
           "hello",
@@ -164,7 +164,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
         2048
       )
 
-      assert_raises(TypeError) do
+      assert_raise(TypeError) do
         OpenSSL::PKCS12.create(
           "omg",
           "hello",
diff --git a/test/test_pkey_dh.rb b/test/test_pkey_dh.rb
index 67dd3e7d..8bf98166 100644
--- a/test/test_pkey_dh.rb
+++ b/test/test_pkey_dh.rb
@@ -13,7 +13,7 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase
 
   def test_new_break
     assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
-    assert_raises(RuntimeError) do
+    assert_raise(RuntimeError) do
       OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
     end
   end