kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

test_pstore.rb: fix for timeout

Browse source 
* 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
This commit is contained in:
shirosaki 2012-09-04 12:45:31 +00:00
parent 4ef43fc02f
commit 0dc94b8b3e
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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

5
test/ruby/envutil.rb
View file

@ -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

2
test/test_pstore.rb
View file

@ -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}"}