* test/test_pty.rb: same as r29280, skip tests when PTY allocation

failed (that's not our fault).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2012-03-19 06:08:44 +00:00
parent 27c5389879
commit d4f0f28430
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,8 @@
Mon Mar 19 15:05:54 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/test_pty.rb: same as r29280, skip tests when PTY allocation
failed (that's not our fault).
Sun Mar 18 23:21:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Mar 18 23:21:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (aligned_free): fix condition for free. memalign() and * gc.c (aligned_free): fix condition for free. memalign() and

View File

@ -176,6 +176,9 @@ class TestPTY < Test::Unit::TestCase
sleep(0.1) sleep(0.1)
end until st2 = PTY.check(pid) end until st2 = PTY.check(pid)
end end
rescue RuntimeError
skip $!
else
assert_equal(pid, st1.pid) if st1 assert_equal(pid, st1.pid) if st1
assert_nil(st1) assert_nil(st1)
assert_equal(pid, st2.pid) assert_equal(pid, st2.pid)
@ -192,6 +195,9 @@ class TestPTY < Test::Unit::TestCase
sleep(0.1) sleep(0.1)
st2 = assert_raise(PTY::ChildExited, bug2642) {PTY.check(pid, true)}.status st2 = assert_raise(PTY::ChildExited, bug2642) {PTY.check(pid, true)}.status
end end
rescue RuntimeError
skip $!
else
assert_equal(pid, st1.pid) if st1 assert_equal(pid, st1.pid) if st1
assert_nil(st1) assert_nil(st1)
assert_equal(pid, st2.pid) assert_equal(pid, st2.pid)
@ -206,6 +212,8 @@ class TestPTY < Test::Unit::TestCase
assert(r.close_on_exec?) assert(r.close_on_exec?)
assert(w.close_on_exec?) assert(w.close_on_exec?)
} }
rescue RuntimeError
skip $!
end end
end if defined? PTY end if defined? PTY