summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-08 04:03:53 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-08 04:03:53 +0000
commit14c46e5f1a4e2b905dcc17880fa40e09a4690b53 (patch)
treeedfdd48da8eabae8eb8ad30be73bb2ce03f13890
parentbe801955e95c259bf819c71dfc3d5f6102eb4ddf (diff)
* test/io/console/test_io_console.rb (test_getpass): s.getpass
should be tested. Narrow ensure block. This reverts r52911. [Bug #11780] [ruby-dev:49412] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/io/console/test_io_console.rb20
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 880fcabd478..955f6c5245f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 8 12:58:04 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * test/io/console/test_io_console.rb (test_getpass): s.getpass
+ should be tested. Narrow ensure block. This reverts r52911.
+ [Bug #11780] [ruby-dev:49412]
+
Tue Dec 8 10:40:21 2015 Eric Wong <e@80x24.org>
* benchmark/bm_vm2_case_lit.rb: new benchmark
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index 0e161b5c7ac..74674ced9a3 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -181,18 +181,18 @@ class TestIO_Console < Test::Unit::TestCase
end
def test_getpass
- th = nil
helper {|m, s|
- th = Thread.start {
- sleep 0.1
- s.print "asdf\n"
- }
- assert_equal("asdf", m.getpass)
- assert_equal("\n", s.readpartial(2))
- th.join
+ begin
+ th = Thread.start {
+ sleep 0.1
+ m.print "asdf\n"
+ }
+ assert_equal("asdf", s.getpass("> "))
+ assert_equal("> \r\n", m.readpartial(10))
+ ensure
+ th.join rescue nil
+ end
}
- ensure
- th.join rescue nil
end
def test_iflush