No more nondistributable layers in MS registry

estesp · estesp · commit 38b0f970f018 · 2023-06-13T16:34:44.000-04:00
Microsoft announced the removal of nondistributable layers from their
images today. This makes the convert test fail since it assumes the
first layer is nondistributable on Windows during the test.

Signed-off-by: Phil Estes &lt;estesp@amazon.com&gt;
diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go
@@ -80,10 +80,6 @@ func TestConvert(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, l := range mani.Layers {
-		if plats[0].OS == "windows" {
-			assert.Equal(t, ocispec.MediaTypeImageLayerNonDistributable, l.MediaType)
-		} else {
-			assert.Equal(t, ocispec.MediaTypeImageLayer, l.MediaType)
-		}
+		assert.Equal(t, ocispec.MediaTypeImageLayer, l.MediaType)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,6 @@ func TestConvert(t *testing.T) {`
`80`	`80`	`t.Fatal(err)`
`81`	`81`	`}`
`82`	`82`	`for _, l := range mani.Layers {`
`83`		`- if plats[0].OS == "windows" {`
`84`		`- assert.Equal(t, ocispec.MediaTypeImageLayerNonDistributable, l.MediaType)`
`85`		`- } else {`
`86`		`- assert.Equal(t, ocispec.MediaTypeImageLayer, l.MediaType)`
`87`		`- }`
	`83`	`+ assert.Equal(t, ocispec.MediaTypeImageLayer, l.MediaType)`
`88`	`84`	`}`
`89`	`85`	`}`