diff options
Diffstat (limited to 'test/io/console')
-rw-r--r-- | test/io/console/test_io_console.rb | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index 980478fcbf..c69eec757e 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -180,28 +180,6 @@ class TestIO_Console < Test::Unit::TestCase } end - def test_getpass - # run_pty("p IO.console.getpass('> ')") do |r, w| - # assert_equal("> ", r.readpartial(10)) - # w.print "asdf\n" - # assert_equal("\r\n", r.gets) - # assert_equal("\"asdf\"", r.gets.chomp) - # end - helper {|m, s| - begin - th = Thread.start { - s.getpass("> ") - } - assert_equal("> ", m.readpartial(10)) - m.print "asdf\n" - assert_equal("asdf", th.value) - assert_equal("\r\n", m.gets) - ensure - th.join rescue nil - end - } - end - def test_iflush helper {|m, s| m.print "a" @@ -292,18 +270,17 @@ class TestIO_Console < Test::Unit::TestCase rescue RuntimeError skip $! else + result = [] + n.times {result << r.gets.chomp} + Process.wait(pid) if block_given? - yield r, w, pid + yield result else - result = [] - n.times {result << r.gets.chomp} - Process.wait(pid) result end ensure r.close if r w.close if w - Process.wait(pid) if pid end end if defined?(PTY) and defined?(IO::console) |