Skip to content

Commit 6282b15

Browse files
committed
* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
fix previous commit. [Bug ruby#11060] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent b0ed276 commit 6282b15

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Fri Jul 3 21:54:46 2015 NAKAMURA Usaku <[email protected]>
2+
3+
* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
4+
fix previous commit. [Bug #11060]
5+
16
Fri Jul 3 19:28:51 2015 NAKAMURA Usaku <[email protected]>
27

38
* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):

test/ruby/test_require.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,13 +691,14 @@ def test_require_with_loaded_features_pop
691691
def test_loading_fifo_threading
692692
Tempfile.create(%w'fifo .rb') {|f|
693693
f.close
694-
File.unlink(f.path) rescue nil
694+
File.unlink(f.path)
695695
File.mkfifo(f.path)
696696
assert_separately(["-", f.path], <<-END, timeout: 3)
697697
th = Thread.current
698698
Thread.start {begin sleep(0.001) end until th.stop?; th.raise(IOError)}
699699
assert_raise(IOError) {load(ARGV[0])}
700700
END
701701
}
702+
rescue Errno::ENOENT
702703
end unless /mswin|mingw/ =~ RUBY_PLATFORM
703704
end

0 commit comments

Comments
 (0)