Merge pull request #123 from imeoer/fix-unpack-test

tests: fix panic for unpack test
containerd · Aug 3, 2022 · 92d4e57 · 92d4e57
2 parents c360523 + ca15ba1
commit 92d4e57
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/tests/converter_test.go b/tests/converter_test.go
@@ -20,6 +20,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -73,25 +74,39 @@ func ensureNoFile(t *testing.T, name string) {
 }
 
 func writeFileToTar(t *testing.T, tw *tar.Writer, name string, data string) {
+	u, err := user.Current()
+	require.NoError(t, err)
+	g, err := user.LookupGroupId(u.Uid)
+	require.NoError(t, err)
+
 	hdr := &tar.Header{
-		Name: name,
-		Mode: 0444,
-		Size: int64(len(data)),
+		Name:  name,
+		Mode:  0444,
+		Size:  int64(len(data)),
+		Uname: u.Name,
+		Gname: g.Name,
 	}
-	err := tw.WriteHeader(hdr)
+	err = tw.WriteHeader(hdr)
 	require.NoError(t, err)
 
 	io.Copy(tw, bytes.NewReader([]byte(data)))
 	require.NoError(t, err)
 }
 
 func writeDirToTar(t *testing.T, tw *tar.Writer, name string) {
+	u, err := user.Current()
+	require.NoError(t, err)
+	g, err := user.LookupGroupId(u.Uid)
+	require.NoError(t, err)
+
 	hdr := &tar.Header{
 		Name:     name,
 		Mode:     0444,
 		Typeflag: tar.TypeDir,
+		Uname:    u.Name,
+		Gname:    g.Name,
 	}
-	err := tw.WriteHeader(hdr)
+	err = tw.WriteHeader(hdr)
 	require.NoError(t, err)
 }