summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 00:29:52 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 00:29:52 +0000
commit6bc65b35bdf8611837a81dd381eb8c7b61442fc6 (patch)
treed5254eee7dfc84917e5a25e41b737a2fff50f62a
parent261bb184c61b8d881a60c39efba3580472bfbc36 (diff)
* 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
-rw-r--r--ChangeLog8
-rw-r--r--test/pathname/test_pathname.rb3
-rw-r--r--test/ruby/envutil.rb8
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e4275c..4b361c4 100644
--- a/ChangeLog
+++ b/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
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index 6ad9544..94bcffa 100644
--- a/test/pathname/test_pathname.rb
+++ b/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
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 0d5632d..5e467a1c 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={})