schema: Drop self-describing media types from manifest(-list) tests

Catching up with 5fc84e5 (specs-go: clarify mediatypes,
2016-10-20, #411).

Signed-off-by: W. Trevor King <[email protected]>

Author: wking

schema/manifest_test.go

@@ -31,9 +31,8 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "invalid",
   "config": {
-    "mediaType": "application/vnd.oci.image.config.v1+json",
+    "mediaType": "invalid",
     "size": 1470,
     "digest": "sha256:c86f7763873b6c0aae22d963bab59b4f5debbed6685761b5951584f6efb0633b"
   },
@@ -54,7 +53,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": "1470",
@@ -77,7 +75,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
@@ -100,7 +97,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
@@ -117,7 +113,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
@@ -154,7 +149,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,
@@ -187,7 +181,6 @@ func TestManifest(t *testing.T) {
 			manifest: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.v1+json",
   "config": {
     "mediaType": "application/vnd.oci.image.config.v1+json",
     "size": 1470,

schema/manifestlist_test.go

@@ -31,10 +31,9 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "invalid",
   "manifests": [
     {
-      "mediaType": "application/vnd.oci.image.manifest.v1+json",
+      "mediaType": "invalid",
       "size": 7143,
       "digest": "sha256:e692418e4cbaf90ca69d05a66403747baa33ee08806650b51fab815ad7fc331f",
       "platform": {
@@ -53,7 +52,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -78,7 +76,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -102,7 +99,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -120,7 +116,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "invalid",
@@ -145,7 +140,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "",
@@ -170,7 +164,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -208,7 +201,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -230,7 +222,6 @@ func TestManifestList(t *testing.T) {
 			manifestList: `
 {
   "schemaVersion": 2,
-  "mediaType": "application/vnd.oci.image.manifest.list.v1+json",
   "manifests": [
     {
       "mediaType": "application/customized.manifest+json",