* 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

1 files changed, 4 insertions, 4 deletions

diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 0d5632d4d9..5e467a1c0a 100644
--- a/test/ruby/envutil.rb
+++ b/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={})