Merge pull request #115 from JuliaIO/sk/read-to-the-bitter-end

read to the end of tarballs
JuliaIO · Jun 2, 2021 · 343e923 · 343e923
2 parents 97aad16 + e3a0a3a
commit 343e923
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -618,13 +618,15 @@ end
                 file = tempname()
                 touch(file)
                 @test_throws ErrorException Tar.extract(tar, file)
+                read(tar) # consume the rest
                 rm(file)
             end
             # extract(tarball, dir) — non-empty directory (error)
             @arg_test tar begin
                 dir = mktempdir()
                 touch(joinpath(dir, "file"))
                 @test_throws ErrorException Tar.extract(tar, dir)
+                read(tar) # consume the rest
                 rm(dir, recursive=true)
             end
         end
@@ -693,13 +695,15 @@ end
                 file = tempname()
                 touch(file)
                 @test_throws ErrorException Tar.extract(predicate, tar, file)
+                read(tar) # consume the rest
                 rm(file)
             end
             # extract(predicate, tarball, dir) — non-empty directory (error)
             @arg_test tar begin
                 dir = mktempdir()
                 touch(joinpath(dir, "file"))
                 @test_throws ErrorException Tar.extract(predicate, tar, dir)
+                read(tar) # consume the rest
                 rm(dir, recursive=true)
             end
         end

diff --git a/test/setup.jl b/test/setup.jl
@@ -130,7 +130,9 @@ function make_test_dir(gen_skip::Bool=false)
     fpath = joinpath(dir, "dir", "file")
     touch(fpath)
     open(fpath, write=true) do io
-        write(io, rand(UInt8, 1000))
+        for i = 1:1000
+            write(io, i % UInt8)
+        end
     end
     mkdir(joinpath(dir, "empty"))
     if gen_skip