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

  fix previous commit.  [Bug #11060]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e723502bc3..03d4312059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul  3 21:54:46 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
+	  fix previous commit.  [Bug #11060]
+
 Fri Jul  3 19:28:51 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 6e62bb2352..562f0c13ea 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -691,7 +691,7 @@ class TestRequire < Test::Unit::TestCase
   def test_loading_fifo_threading
     Tempfile.create(%w'fifo .rb') {|f|
       f.close
-      File.unlink(f.path) rescue nil
+      File.unlink(f.path)
       File.mkfifo(f.path)
       assert_separately(["-", f.path], <<-END, timeout: 3)
       th = Thread.current
@@ -699,5 +699,6 @@ class TestRequire < Test::Unit::TestCase
       assert_raise(IOError) {load(ARGV[0])}
       END
     }
+  rescue Errno::ENOENT
   end unless /mswin|mingw/ =~ RUBY_PLATFORM
 end