Skip to content

Commit

Permalink
Try #230:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] authored Jan 25, 2022
2 parents 47ba453 + ebd54da commit ac50ebd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/s3path.jl
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ function Base.readdir(fp::S3Path; join=false, sort=true)
sort && sort!(results)

# Return results, possibly joined with the root path if join=true
return join ? joinpath.(fp, results) : results
return join ? string.(joinpath.(fp, results)) : results
else
throw(ArgumentError("\"$fp\" is not a directory"))
end
Expand Down
14 changes: 7 additions & 7 deletions test/s3path.jl
Original file line number Diff line number Diff line change
Expand Up @@ -245,19 +245,19 @@ end
function verify_files(path::S3Path)
@test readdir(path) == ["emptydir/", "subdir1/", "test_01.txt"]
@test readdir(path; join=true) ==
[path / "emptydir/", path / "subdir1/", path / "test_01.txt"]
string.([path / "emptydir/", path / "subdir1/", path / "test_01.txt"])
@test readdir(path / "emptydir/") == []
@test readdir(path / "emptydir/"; join=true) == []
@test readdir(path / "subdir1/") == ["subdir2/", "test_02.txt", "test_03.txt"]
@test readdir(path / "subdir1/"; join=true) == [
@test readdir(path / "subdir1/"; join=true) == string.([
path / "subdir1/" / "subdir2/",
path / "subdir1/" / "test_02.txt",
path / "subdir1/" / "test_03.txt",
]
])
@test readdir(path / "subdir1/subdir2/") == ["subdir3/", "test_04.txt"]
@test readdir(path / "subdir1/subdir2/"; join=true) == [
@test readdir(path / "subdir1/subdir2/"; join=true) == string.([
path / "subdir1/subdir2/" / "subdir3/", path / "subdir1/subdir2/" / "test_04.txt"
]
])
@test readdir(path / "subdir1/subdir2/subdir3/") == []
@test readdir(path / "subdir1/subdir2/subdir3/"; join=true) == []
end
Expand All @@ -269,11 +269,11 @@ function verify_files(path::AbstractPath)
@test readdir(path / "emptydir/") == []
VERSION >= v"1.4.0" && @test readdir(path / "emptydir/"; join=true) == []
@test readdir(path / "subdir1/") == ["subdir2", "test_02.txt", "test_03.txt"]
VERSION >= v"1.4.0" && @test readdir(path / "subdir1/"; join=true) == [
VERSION >= v"1.4.0" && @test readdir(path / "subdir1/"; join=true) == string.([
path / "subdir1" / "subdir2",
path / "subdir1" / "test_02.txt",
path / "subdir1/" / "subdir1/test_03.txt",
]
])
@test readdir(path / "subdir1/subdir2/") == ["subdir3", "test_04.txt"]
VERSION >= v"1.4.0" && @test readdir(path / "subdir1/subdir2/"; join=true) == [
path / "subdir1/subdir2/" / "subdir3", path / "subdir1/subdir2/" / "test_04.txt"
Expand Down

0 comments on commit ac50ebd

Please sign in to comment.