mkpath should always return the path [fix #29989] (#29990)

(cherry picked from commit 151f853)
JuliaLang · Feb 11, 2019 · 8b79d2b · 8b79d2b
1 parent 66194ad
commit 8b79d2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/base/file.jl b/base/file.jl
@@ -206,13 +206,13 @@ julia> readdir("test")
 function mkpath(path::AbstractString; mode::Integer = 0o777)
     isdirpath(path) && (path = dirname(path))
     dir = dirname(path)
-    (path == dir || isdir(path)) && return
+    (path == dir || isdir(path)) && return path
     mkpath(dir, mode = checkmode(mode))
     try
         mkdir(path, mode = mode)
-    # If there is a problem with making the directory, but the directory
-    # does in fact exist, then ignore the error. Else re-throw it.
     catch err
+        # If there is a problem with making the directory, but the directory
+        # does in fact exist, then ignore the error. Else re-throw it.
         if !isa(err, SystemError) || !isdir(path)
             rethrow()
         end

diff --git a/test/file.jl b/test/file.jl
@@ -1004,13 +1004,15 @@ rm(dir)
 mktempdir() do dir
     name1 = joinpath(dir, "apples")
     name2 = joinpath(dir, "bannanas")
-    @test touch(name1)==name1
+    @test touch(name1) == name1 # when it doesn't exist
+    @test touch(name1) == name1 # when it does exist
     @test mv(name1, name2) == name2
     @test cp(name2, name1) == name1
     namedir = joinpath(dir, "chalk")
     namepath = joinpath(dir, "chalk","cheese","fresh")
-    @test mkdir(namedir) == namedir
-    @test mkpath(namepath) == namepath
+    @test mkdir(namedir) == namedir # when it doesn't exist
+    @test mkpath(namepath) == namepath # when it doesn't exist
+    @test mkpath(namepath) == namepath # when it does exist
 end