summaryrefslogtreecommitdiff
path: root/lib/test
diff options
context:
space:
mode:
authorntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 23:00:29 +0000
committerntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 23:00:29 +0000
commit54ebae1ba1122300a6695bebf64b8609843918e9 (patch)
treecd5d461daf2a29c124aa9dae0735ed792a0e4961 /lib/test
parentfbcac5f129bed8a9df4174f554ee018695e8c040 (diff)
* lib/test/unit.rb: do not run tests if $! is set.
* lib/test/unit/assertionfailederror.rb: extend StandardError instead Exception (irb catches the former but not the latter). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test')
-rw-r--r--lib/test/unit.rb2
-rw-r--r--lib/test/unit/assertionfailederror.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 6fab874f23..ce2eb85da7 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -272,4 +272,4 @@ module Test
end
end
-at_exit{Test::Unit::AutoRunner.run($0) unless(Test::Unit.run?)}
+at_exit{Test::Unit::AutoRunner.run($0) unless($! || Test::Unit.run?)}
diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb
index 9b9e53f16c..0854203675 100644
--- a/lib/test/unit/assertionfailederror.rb
+++ b/lib/test/unit/assertionfailederror.rb
@@ -8,7 +8,7 @@ module Test
module Unit
# Thrown by Test::Unit::Assertions when an assertion fails.
- class AssertionFailedError < Exception
+ class AssertionFailedError < StandardError
end
end
end