summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-10 06:45:21 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-10 06:45:21 +0000
commit09c8651387bed889bd3f4763962d8ce73bd348b3 (patch)
tree8e86646f24b8a5065cc026040ed11c3542126622
parent5a363fbb50570063019fd1dfd13490f053cbb29f (diff)
Don't break test-all.
Revert "* lib/test/unit/assertions.rb (Test::Unit::Assertions#skip): reason to" This reverts commit r31982. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/test/unit/assertions.rb5
2 files changed, 1 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ee96406..38b3b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,10 +3,7 @@ Fri Jun 10 14:34:24 2011 Koichi Sasada <ko1@atdot.net>
* common.mk: restore TESTRUN_SCRIPT to "$(srcdir)/test.rb".
TESTRUN_SCRIPT is used by "make run", "make gdb" and so on.
-Fri Jun 10 13:04:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#skip): reason to
- skip should be explained.
+Fri Jun 10 13:01:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_module.rb (TestModule#remove_rake_mixins): remove all
module related to Rake.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 4752943..db0679c 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -24,11 +24,6 @@ module Test
super
end
- def skip(msg = nil, bt = caller)
- raise ArgumentError, "no reason to skip" unless msg
- super
- end
-
def assert_block(*msgs)
assert yield, *msgs
end