nobu	2015-10-30 16:17:08 +0900 (Fri, 30 Oct 2015)

  New Revision: 52388

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52388

  Log:
    test/fiddle: revert r52384 partially

  Modified files:
    trunk/test/fiddle/test_closure.rb
    trunk/test/fiddle/test_cparser.rb
    trunk/test/fiddle/test_func.rb
    trunk/test/fiddle/test_import.rb
Index: test/fiddle/test_cparser.rb
===================================================================
--- test/fiddle/test_cparser.rb	(revision 52387)
+++ test/fiddle/test_cparser.rb	(revision 52388)
@@ -60,7 +60,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_cparser.rb#L60
     end
 
     def test_undefined_ctype
-      assert_raise(DLError) { parse_ctype('DWORD') }
+      assert_raises(DLError) { parse_ctype('DWORD') }
     end
 
     def test_undefined_ctype_with_type_alias
@@ -92,7 +92,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_cparser.rb#L92
     end
 
     def test_struct_undefined
-      assert_raise(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
+      assert_raises(DLError) { parse_struct_signature(['int i', 'DWORD cb']) }
     end
 
     def test_struct_undefined_with_type_alias
Index: test/fiddle/test_import.rb
===================================================================
--- test/fiddle/test_import.rb	(revision 52387)
+++ test/fiddle/test_import.rb	(revision 52388)
@@ -44,7 +44,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_import.rb#L44
 
   class TestImport < TestCase
     def test_ensure_call_dlload
-      err = assert_raise(RuntimeError) do
+      err = assert_raises(RuntimeError) do
         Class.new do
           extend Importer
           extern "void *strcpy(char*, char*)"
Index: test/fiddle/test_func.rb
===================================================================
--- test/fiddle/test_func.rb	(revision 52387)
+++ test/fiddle/test_func.rb	(revision 52388)
@@ -12,7 +12,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_func.rb#L12
 
     def test_syscall_with_tainted_string
       f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT)
-      assert_raise(SecurityError) do
+      assert_raises(SecurityError) do
         Thread.new {
           $SAFE = 1
           f.call("uname -rs".taint)
Index: test/fiddle/test_closure.rb
===================================================================
--- test/fiddle/test_closure.rb	(revision 52387)
+++ test/fiddle/test_closure.rb	(revision 52388)
@@ -6,15 +6,15 @@ end https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_closure.rb#L6
 module Fiddle
   class TestClosure < Fiddle::TestCase
     def test_argument_errors
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Closure.new(TYPE_INT, TYPE_INT)
       end
 
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Closure.new('foo', [TYPE_INT])
       end
 
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Closure.new(TYPE_INT, ['meow!'])
       end
     end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/