From c7ce1554126fc0de1aaf12988ac8cf776cf57c9c Mon Sep 17 00:00:00 2001 From: normal Date: Thu, 9 Aug 2018 09:02:32 +0000 Subject: [PATCH] test/io/console/test_io_console.rb: fix short read failures Running with TESTS=--no-retry, I sometimes get short reads leading to failures due to the use of IO#readpartial instead of IO#gets. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/io/console/test_io_console.rb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb index 140fc01782..9ad07bce8b 100644 --- a/test/io/console/test_io_console.rb +++ b/test/io/console/test_io_console.rb @@ -136,22 +136,22 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do sleep 0.1 s.print "b\n" sleep 0.1 - assert_equal("a\r\nb\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("a\r\nb\r\n", m.gets + m.gets) + assert_equal("a\n", s.gets) s.noecho { assert_not_send([s, :echo?]) m.print "a\n" s.print "b\n" - assert_equal("b\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("b\r\n", m.gets) + assert_equal("a\n", s.gets) } assert_send([s, :echo?]) m.print "a\n" sleep 0.1 s.print "b\n" sleep 0.1 - assert_equal("a\r\nb\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("a\r\nb\r\n", m.gets + m.gets) + assert_equal("a\n", s.gets) } end @@ -174,22 +174,22 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do sleep 0.1 s.print "b\n" sleep 0.1 - assert_equal("a\r\nb\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("a\r\nb\r\n", m.gets + m.gets) + assert_equal("a\n", s.gets) s.echo = false assert_not_send([s, :echo?]) m.print "a\n" s.print "b\n" - assert_equal("b\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("b\r\n", m.gets) + assert_equal("a\n", s.gets) s.echo = true assert_send([s, :echo?]) m.print "a\n" sleep 0.1 s.print "b\n" sleep 0.1 - assert_equal("a\r\nb\r\n", m.readpartial(10)) - assert_equal("a\n", s.readpartial(10)) + assert_equal("a\r\nb\r\n", m.gets + m.gets) + assert_equal("a\n", s.gets) } end @@ -211,7 +211,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do s.iflush m.print "b\n" m.flush - assert_equal("b\n", s.readpartial(10)) + assert_equal("b\n", s.gets) } end @@ -232,7 +232,7 @@ defined?(PTY) and defined?(IO.console) and TestIO_Console.class_eval do s.ioflush m.print "b\n" m.flush - assert_equal("b\n", s.readpartial(10)) + assert_equal("b\n", s.gets) } end