public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid comparing uncompressed and compressed images in the unit test.

This commit is contained in:
chhsia0 2019-08-24 02:02:04 -07:00
parent 11f3b791cd
commit ea1a92712c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/executor/push_test.go
View File

@ -74,7 +74,7 @@ func (m *mockRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
return &http.Response{Body: ioutil.NopCloser(bytes.NewBufferString(ua))}, nil return &http.Response{Body: ioutil.NopCloser(bytes.NewBufferString(ua))}, nil
} }
func Test_OCILayoutPath(t *testing.T) { func TestOCILayoutPath(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "") tmpDir, err := ioutil.TempDir("", "")
if err != nil { if err != nil {
t.Fatalf("could not create temp dir: %s", err) t.Fatalf("could not create temp dir: %s", err)
@ -91,6 +91,11 @@ func Test_OCILayoutPath(t *testing.T) {
t.Fatalf("could not get image digest: %s", err) t.Fatalf("could not get image digest: %s", err)
} }
want, err := image.Manifest()
if err != nil {
t.Fatalf("could not get image manifest: %s", err)
}
opts := config.KanikoOptions{ opts := config.KanikoOptions{
NoPush: true, NoPush: true,
OCILayoutPath: tmpDir, OCILayoutPath: tmpDir,
@ -100,12 +105,17 @@ func Test_OCILayoutPath(t *testing.T) {
t.Fatalf("could not push image: %s", err) t.Fatalf("could not push image: %s", err)
} }
index, err := layout.ImageIndexFromPath(tmpDir) layoutIndex, err := layout.ImageIndexFromPath(tmpDir)
if err != nil { if err != nil {
t.Fatalf("could not get index from layout: %s", err) t.Fatalf("could not get index from layout: %s", err)
} }
testutil.CheckError(t, false, validate.Index(index)) testutil.CheckError(t, false, validate.Index(layoutIndex))
got, err := index.Image(digest) layoutImage, err := layoutIndex.Image(digest)
testutil.CheckErrorAndDeepEqual(t, false, err, image, got) if err != nil {
t.Fatalf("could not get image from layout: %s", err)
}
got, err := layoutImage.Manifest()
testutil.CheckErrorAndDeepEqual(t, false, err, want, got)
} }