From ea1a92712ca810286e9318e023d3945ba0f65131 Mon Sep 17 00:00:00 2001
From: chhsia0 <chhsiao@mesosphere.io>
Date: Sat, 24 Aug 2019 02:02:04 -0700
Subject: [PATCH] Avoid comparing uncompressed and compressed images in the
 unit test.

---
 pkg/executor/push_test.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkg/executor/push_test.go b/pkg/executor/push_test.go
index 220fc444f..63857f4f0 100644
--- a/pkg/executor/push_test.go
+++ b/pkg/executor/push_test.go
@@ -74,7 +74,7 @@ func (m *mockRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
 	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("", "")
 	if err != nil {
 		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)
 	}
 
+	want, err := image.Manifest()
+	if err != nil {
+		t.Fatalf("could not get image manifest: %s", err)
+	}
+
 	opts := config.KanikoOptions{
 		NoPush:        true,
 		OCILayoutPath: tmpDir,
@@ -100,12 +105,17 @@ func Test_OCILayoutPath(t *testing.T) {
 		t.Fatalf("could not push image: %s", err)
 	}
 
-	index, err := layout.ImageIndexFromPath(tmpDir)
+	layoutIndex, err := layout.ImageIndexFromPath(tmpDir)
 	if err != nil {
 		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)
-	testutil.CheckErrorAndDeepEqual(t, false, err, image, got)
+	layoutImage, err := layoutIndex.Image(digest)
+	if err != nil {
+		t.Fatalf("could not get image from layout: %s", err)
+	}
+
+	got, err := layoutImage.Manifest()
+	testutil.CheckErrorAndDeepEqual(t, false, err, want, got)
 }