summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/test_pty.rb8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9eaee2b403..7ecd390e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* gc.c (aligned_free): fix condition for free. memalign() and
diff --git a/test/test_pty.rb b/test/test_pty.rb
index 122fb6c13b..0b05c62477 100644
--- a/test/test_pty.rb
+++ b/test/test_pty.rb
@@ -176,6 +176,9 @@ class TestPTY < Test::Unit::TestCase
sleep(0.1)
end until st2 = PTY.check(pid)
end
+ rescue RuntimeError
+ skip $!
+ else
assert_equal(pid, st1.pid) if st1
assert_nil(st1)
assert_equal(pid, st2.pid)
@@ -192,6 +195,9 @@ class TestPTY < Test::Unit::TestCase
sleep(0.1)
st2 = assert_raise(PTY::ChildExited, bug2642) {PTY.check(pid, true)}.status
end
+ rescue RuntimeError
+ skip $!
+ else
assert_equal(pid, st1.pid) if st1
assert_nil(st1)
assert_equal(pid, st2.pid)
@@ -206,6 +212,8 @@ class TestPTY < Test::Unit::TestCase
assert(r.close_on_exec?)
assert(w.close_on_exec?)
}
+ rescue RuntimeError
+ skip $!
end
end if defined? PTY