From 01ebc04fa242eaa9ea6129e69a37570e92360056 Mon Sep 17 00:00:00 2001 From: eregon Date: Mon, 29 May 2017 11:19:42 +0000 Subject: Simplify, avoid extra exceptions and add test for concurrent mspec mkdir_p git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/mspec/lib/mspec/helpers/fs.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'spec/mspec/lib') diff --git a/spec/mspec/lib/mspec/helpers/fs.rb b/spec/mspec/lib/mspec/helpers/fs.rb index 5a9c3bdba1..2200339bd7 100644 --- a/spec/mspec/lib/mspec/helpers/fs.rb +++ b/spec/mspec/lib/mspec/helpers/fs.rb @@ -17,16 +17,19 @@ class Object parts.each do |part| name = File.join name, part - stat = File.stat name rescue nil - if stat and stat.file? + if File.file? name raise ArgumentError, "path component of #{path} is a file" end - unless stat and stat.directory? + unless File.directory? name begin Dir.mkdir name - rescue Errno::EEXIST - raise unless File.directory? name + rescue Errno::EEXIST => e + if File.directory? name + # OK, another process/thread created the same directory + else + raise e + end end end end -- cgit v1.2.3