1 files changed, 8 insertions, 5 deletions
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