* test/ruby/envutil.rb (assert_normal_exit): use assert. fix

faildesc.

* test/pathname/test_pathname.rb (test_lchmod): test Pathname#lchmod
  using assert_normal_exit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Sat Aug  7 09:28:12 2010  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_normal_exit): use assert.  fix
+	  faildesc.
+
+	* test/pathname/test_pathname.rb (test_lchmod): test Pathname#lchmod
+	  using assert_normal_exit.
+
 Sat Aug  7 08:26:26 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pathname/pathname.c (path_chown): Pathname#chown translated

test/pathname/test_pathname.rb

@@ -7,6 +7,8 @@ require 'fileutils'
 require 'tmpdir'
 require 'enumerator'
 
+require_relative '../ruby/envutil'
+
 class TestPathname < Test::Unit::TestCase
   def self.define_assertion(name, &block)
     @defassert_num ||= {}
@@ -732,6 +734,7 @@ class TestPathname < Test::Unit::TestCase
       File.symlink("a", "l")
       path = Pathname("l")
       old = path.lstat.mode
+      assert_normal_exit %{ require "pathname"; Pathname("foo").lchmod(nil) }
       begin
         path.lchmod(0444)
       rescue NotImplementedError

test/ruby/envutil.rb

@@ -138,15 +138,15 @@ module Test
           if !message.empty?
             full_message << message << "\n"
           end
-          if msg.empty?
+          if message.empty?
             full_message << "pid #{pid} killed by #{sigdesc}"
           else
-            msg << "\n" if /\n\z/ !~ msg
-            full_message << "pid #{pid} killed by #{sigdesc}\n#{msg.gsub(/^/, '| ')}"
+            message << "\n" if /\n\z/ !~ message
+            full_message << "pid #{pid} killed by #{sigdesc}\n#{message.gsub(/^/, '| ')}"
           end
           full_message
         end
-        assert_block(faildesc) { !status.signaled? }
+        assert !status.signaled?, faildesc
       end
 
       def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, opt={})