diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-05 15:15:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-05 15:15:43 +0000 |
commit | 44785befeabd09d5d34f33b33783c0ec54f06a1f (patch) | |
tree | 56830470411bdaf525d1f4c489b120125efb9097 /test/ruby/test_signal.rb | |
parent | 01e3a55648559ba3d54cdf72d5c55f71a41e69e9 (diff) | |
download | ruby-44785befeabd09d5d34f33b33783c0ec54f06a1f.tar.gz |
* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
array as argument.
* test/ruby/test_*.rb: moved invariants to left side in
assert_equal, and use assert_nil, assert_raises and so on.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_signal.rb')
-rw-r--r-- | test/ruby/test_signal.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb index eabeedc38a..61240cd65d 100644 --- a/test/ruby/test_signal.rb +++ b/test/ruby/test_signal.rb @@ -9,18 +9,16 @@ class TestSignal < Test::Unit::TestCase trap "SIGINT", proc{|sig| $x = 2} Process.kill "SIGINT", $$ sleep 0.1 - assert_equal($x, 2) - + assert_equal(2, $x) + trap "SIGINT", proc{raise "Interrupt"} - - x = false - begin + + x = assert_raises(RuntimeError) do Process.kill "SIGINT", $$ sleep 0.1 - rescue - x = $! end - assert(x && /Interrupt/ =~ x.message) + assert(x) + assert_match(/Interrupt/, x.message) end end end |