0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix racy tests in pkg/archive

Browse source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2016-09-13 01:39:16 +00:00
parent 6fafd07282
commit 62cbd2589f
1 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
pkg/archive/archive_test.go
View file

@ -94,60 +94,45 @@ func TestIsArchivePathTar(t *testing.T) {
} }
} }
func TestDecompressStreamGzip(t *testing.T) { func testDecompressStream(t *testing.T, ext, compressCommand string) {
cmd := exec.Command("sh", "-c", "touch /tmp/archive && gzip -f /tmp/archive") cmd := exec.Command("sh", "-c",
fmt.Sprintf("touch /tmp/archive && %s /tmp/archive", compressCommand))
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
if err != nil { if err != nil {
t.Fatalf("Fail to create an archive file for test : %s.", output) t.Fatalf("Failed to create an archive file for test : %s.", output)
} }
archive, err := os.Open(tmp + "archive.gz") filename := "archive." + ext
archive, err := os.Open(tmp + filename)
if err != nil { if err != nil {
t.Fatalf("Fail to open file archive.gz") t.Fatalf("Failed to open file %s: %v", filename, err)
} }
defer archive.Close() defer archive.Close()
_, err = DecompressStream(archive) r, err := DecompressStream(archive)
if err != nil { if err != nil {
t.Fatalf("Failed to decompress a gzip file.") t.Fatalf("Failed to decompress %s: %v", filename, err)
}
if _, err = ioutil.ReadAll(r); err != nil {
t.Fatalf("Failed to read the decompressed stream: %v ", err)
}
if err = r.Close(); err != nil {
t.Fatalf("Failed to close the decompressed stream: %v ", err)
} }
} }
func TestDecompressStreamBzip2(t *testing.T) { func TestDecompressStreamGzip(t *testing.T) {
cmd := exec.Command("sh", "-c", "touch /tmp/archive && bzip2 -f /tmp/archive") testDecompressStream(t, "gz", "gzip -f")
output, err := cmd.CombinedOutput() }
if err != nil {
t.Fatalf("Fail to create an archive file for test : %s.", output)
}
archive, err := os.Open(tmp + "archive.bz2")
if err != nil {
t.Fatalf("Fail to open file archive.bz2")
}
defer archive.Close()
_, err = DecompressStream(archive) func TestDecompressStreamBzip2(t *testing.T) {
if err != nil { testDecompressStream(t, "bz2", "bzip2 -f")
t.Fatalf("Failed to decompress a bzip2 file.")
}
} }
func TestDecompressStreamXz(t *testing.T) { func TestDecompressStreamXz(t *testing.T) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skip("Xz not present in msys2") t.Skip("Xz not present in msys2")
} }
cmd := exec.Command("sh", "-c", "touch /tmp/archive && xz -f /tmp/archive") testDecompressStream(t, "xz", "xz -f")
output, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("Fail to create an archive file for test : %s.", output)
}
archive, err := os.Open(tmp + "archive.xz")
if err != nil {
t.Fatalf("Fail to open file archive.xz")
}
defer archive.Close()
_, err = DecompressStream(archive)
if err != nil {
t.Fatalf("Failed to decompress an xz file.")
}
} }
func TestCompressStreamXzUnsuported(t *testing.T) { func TestCompressStreamXzUnsuported(t *testing.T) {