summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-06 12:41:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-06 12:41:47 +0000
commit51cb462f428298458a49d526d299a20ebc8d83ef (patch)
tree44603a40468cb3fa6be532936f065b93a79392b4
parenta2e025a7d05047a75c749f64ea7819a4540bb3d3 (diff)
test_io_console.rb: wait
* test/io/console/test_io_console.rb (test_getpass): wait slave thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/io/console/test_io_console.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index dc489166e8..379921f337 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -189,9 +189,10 @@ class TestIO_Console < Test::Unit::TestCase
}
assert_equal("asdf", m.getpass("> "))
assert_equal("\n", s.readpartial(2))
+ th.join
}
ensure
- th.join
+ th.join rescue nil
end
def test_iflush