diff options
| author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-04 12:45:31 +0000 |
|---|---|---|
| committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-04 12:45:31 +0000 |
| commit | 0dc94b8b3e6c9440c05f18387c7dc8207094d89a (patch) | |
| tree | edeedd0ca289b4f926f8ac494b4752279289ec6c | |
| parent | 4ef43fc02f9446da4eaa508c439d3caa1a244ebf (diff) | |
test_pstore.rb: fix for timeout
* test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error
instead of IOError if the timeout has expired.
* test/test_pstore.rb
(PStoreTest#test_pstore_files_are_accessed_as_binary_files):
increase timeout because this test is slow on Windows.
[ruby-core:47402] [Bug #6965]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 5 | ||||
| -rw-r--r-- | test/test_pstore.rb | 2 |
3 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,13 @@ +Tue Sep 4 20:55:17 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error + instead of IOError if the timeout has expired. + + * test/test_pstore.rb + (PStoreTest#test_pstore_files_are_accessed_as_binary_files): + increase timeout because this test is slow on Windows. + [ruby-core:47402] [Bug #6965] + Tue Sep 4 11:28:57 2012 URABE Shyouhei <shyouhei@ruby-lang.org> * vm_eval.c (ruby_eval_string_from_file_protect): initializer diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 19290c6f56..d96da1308f 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -74,11 +74,14 @@ module EnvUtil return stdout, stderr, status end ensure + [th_stdout, th_stderr].each do |th| + th.kill if th + end [in_c, in_p, out_c, out_p, err_c, err_p].each do |io| io.close if io && !io.closed? end [th_stdout, th_stderr].each do |th| - (th.kill; th.join) if th + th.join if th end end module_function :invoke_ruby diff --git a/test/test_pstore.rb b/test/test_pstore.rb index 1b93925b0b..ee662669ff 100644 --- a/test/test_pstore.rb +++ b/test/test_pstore.rb @@ -120,7 +120,7 @@ class PStoreTest < Test::Unit::TestCase def test_pstore_files_are_accessed_as_binary_files bug5311 = '[ruby-core:39503]' n = 128 - assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311) + assert_in_out_err(["-Eutf-8:utf-8", "-rpstore", "-", @pstore_file], <<-SRC, [bug5311], [], bug5311, timeout: 15) @pstore = PStore.new(ARGV[0]) (1..#{n}).each do |i| @pstore.transaction {@pstore["Key\#{i}"] = "value \#{i}"} |