code review 6700047: archive/tar: read/write extended pax/gnu tar archives

src/pkg/archive/tar/reader_test.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package tar
 
 import (
         "bytes"
         "crypto/md5"
         "fmt"
@@ skipping 278 matching lines @@
                         t.Fatalf("Unexpected error: %v", err)
                 }
         }
 
         if nread != len(test.headers) {
                 t.Errorf("Didn't process all files\nexpected: %d\nprocessed %d\n", len(test.headers), nread)
         }
 }
 
 func TestParsePAXHeader(t *testing.T) {
-        correctHeaders := []byte("30 mtime=1350244992.023960108\n")
-        reader := bytes.NewBuffer(correctHeaders)
-        headers, err := parsePAX(reader)
-        if err != nil {
-                t.Fatalf("Couldn't parse correctly formatted headers %s", err)
-        }
-        if strings.EqualFold(headers["mtime"], "mtime=1350244992.023960108") {
-                t.Fatalf("mtime header incorrectly parsed")
-        }
-        trailer := make([]byte, 100)
-        n, err := reader.Read(trailer)
-        if err != io.EOF || n != 0 {
-                t.Fatal("Buffer wasn't consumed")
+        paxTests := [][3]string{
+                {"a", "a=name", "10 a=name\n"}, // Test case involving multiple acceptable lengths
+                {"a", "a=name", "9 a=name\n"},  // Test case involving multiple acceptable length
+                {"mtime", "mtime=1350244992.023960108", "30 mtime=1350244992.023960108\n"}}
+        for _, test := range paxTests {
+                key, expected, raw := test[0], test[1], test[2]
+                reader := bytes.NewBuffer([]byte(raw))
+                headers, err := parsePAX(reader)
+                if err != nil {
+                        t.Errorf("Couldn't parse correctly formatted headers: %v", err)
+                        continue
+                }
+                if strings.EqualFold(headers[key], expected) {
+                        t.Errorf("mtime header incorrectly parsed: got %s, wanted %s", headers[key], expected)
+                        continue
+                }
+                trailer := make([]byte, 100)
+                n, err := reader.Read(trailer)
+                if err != io.EOF || n != 0 {
+                        t.Error("Buffer wasn't consumed")
+                }
         }
         badHeader := bytes.NewBuffer([]byte("3 somelongkey="))
         if _, err := parsePAX(badHeader); err != ErrHeader {
                 t.Fatal("Unexpected success when parsing bad header")
         }
 }
 
 func TestParsePAXTime(t *testing.T) {
         // Some valid PAX time values
         timestamps := map[string]time.Time{
@@ skipping 27 matching lines @@
         }
         want := &Header{
                 Name:    "a/b/c",
                 Uid:     1000,
                 ModTime: time.Unix(1350244992, 23960108),
         }
         if !reflect.DeepEqual(hdr, want) {
                 t.Errorf("incorrect merge: got %+v, want %+v", hdr, want)
         }
 }