Merge pull request opencontainers#468 from xiekeyang/config-test

Stephen Day · web-flow · commit 621a4e1ff977 · 2016-11-30T13:44:25.000-08:00
fix bug: config test cases MUST include all required fields
diff --git a/schema/config_test.go b/schema/config_test.go
@@ -31,7 +31,13 @@ func TestConfig(t *testing.T) {
 			config: `
 {
     "architecture": "amd64",
-    "os": 123
+    "os": 123,
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
+    }
 }
 `,
 			fail: true,
@@ -47,6 +53,12 @@ func TestConfig(t *testing.T) {
     "os": "linux",
     "config": {
         "User": 1234
+    },
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
     }
 }
 `,
@@ -57,7 +69,15 @@ func TestConfig(t *testing.T) {
 		{
 			config: `
 {
-    "history": "should be an array"
+    "history": "should be an array",
+    "architecture": "amd64",
+    "os": 123,
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
+    }
 }
 `,
 			fail: true,
@@ -67,10 +87,18 @@ func TestConfig(t *testing.T) {
 		{
 			config: `
 {
+    "architecture": "amd64",
+    "os": 123,
     "config": {
         "Env": [
             7353
         ]
+    },
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
     }
 }
 `,
@@ -81,11 +109,19 @@ func TestConfig(t *testing.T) {
 		{
 			config: `
 {
+    "architecture": "amd64",
+    "os": 123,
     "config": {
         "Volumes": [
             "/var/job-result-data",
             "/var/log/my-app-logs"
         ]
+    },
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
     }
 }
 `,
@@ -98,6 +134,7 @@ func TestConfig(t *testing.T) {
 			fail:   true,
 		},
 
+		// valid config with optional fields
 		{
 			config: `
 {
@@ -151,6 +188,23 @@ func TestConfig(t *testing.T) {
       }
     ]
 }
+`,
+			fail: false,
+		},
+
+		// valid config with only required fields
+		{
+			config: `
+{
+    "architecture": "amd64",
+    "os": "linux",
+    "rootfs": {
+      "diff_ids": [
+        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
+      ],
+      "type": "layers"
+    }
+}
 `,
 			fail: false,
 		},

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,13 @@ func TestConfig(t *testing.T) {`
`31`	`31`	config: `
`32`	`32`	`{`
`33`	`33`	`"architecture": "amd64",`
`34`		`- "os": 123`
	`34`	`+ "os": 123,`
	`35`	`+ "rootfs": {`
	`36`	`+ "diff_ids": [`
	`37`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`38`	`+ ],`
	`39`	`+ "type": "layers"`
	`40`	`+ }`
`35`	`41`	`}`
`36`	`42`	`,
`37`	`43`	`fail: true,`
`@@ -47,6 +53,12 @@ func TestConfig(t *testing.T) {`
`47`	`53`	`"os": "linux",`
`48`	`54`	`"config": {`
`49`	`55`	`"User": 1234`
	`56`	`+ },`
	`57`	`+ "rootfs": {`
	`58`	`+ "diff_ids": [`
	`59`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`60`	`+ ],`
	`61`	`+ "type": "layers"`
`50`	`62`	`}`
`51`	`63`	`}`
`52`	`64`	`,
`@@ -57,7 +69,15 @@ func TestConfig(t *testing.T) {`
`57`	`69`	`{`
`58`	`70`	config: `
`59`	`71`	`{`
`60`		`- "history": "should be an array"`
	`72`	`+ "history": "should be an array",`
	`73`	`+ "architecture": "amd64",`
	`74`	`+ "os": 123,`
	`75`	`+ "rootfs": {`
	`76`	`+ "diff_ids": [`
	`77`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`78`	`+ ],`
	`79`	`+ "type": "layers"`
	`80`	`+ }`
`61`	`81`	`}`
`62`	`82`	`,
`63`	`83`	`fail: true,`
`@@ -67,10 +87,18 @@ func TestConfig(t *testing.T) {`
`67`	`87`	`{`
`68`	`88`	config: `
`69`	`89`	`{`
	`90`	`+ "architecture": "amd64",`
	`91`	`+ "os": 123,`
`70`	`92`	`"config": {`
`71`	`93`	`"Env": [`
`72`	`94`	`7353`
`73`	`95`	`]`
	`96`	`+ },`
	`97`	`+ "rootfs": {`
	`98`	`+ "diff_ids": [`
	`99`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`100`	`+ ],`
	`101`	`+ "type": "layers"`
`74`	`102`	`}`
`75`	`103`	`}`
`76`	`104`	`,
`@@ -81,11 +109,19 @@ func TestConfig(t *testing.T) {`
`81`	`109`	`{`
`82`	`110`	config: `
`83`	`111`	`{`
	`112`	`+ "architecture": "amd64",`
	`113`	`+ "os": 123,`
`84`	`114`	`"config": {`
`85`	`115`	`"Volumes": [`
`86`	`116`	`"/var/job-result-data",`
`87`	`117`	`"/var/log/my-app-logs"`
`88`	`118`	`]`
	`119`	`+ },`
	`120`	`+ "rootfs": {`
	`121`	`+ "diff_ids": [`
	`122`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`123`	`+ ],`
	`124`	`+ "type": "layers"`
`89`	`125`	`}`
`90`	`126`	`}`
`91`	`127`	`,
`@@ -98,6 +134,7 @@ func TestConfig(t *testing.T) {`
`98`	`134`	`fail: true,`
`99`	`135`	`},`
`100`	`136`
	`137`	`+ // valid config with optional fields`
`101`	`138`	`{`
`102`	`139`	config: `
`103`	`140`	`{`
`@@ -151,6 +188,23 @@ func TestConfig(t *testing.T) {`
`151`	`188`	`}`
`152`	`189`	`]`
`153`	`190`	`}`
	`191`	+`,
	`192`	`+ fail: false,`
	`193`	`+ },`
	`194`	`+`
	`195`	`+ // valid config with only required fields`
	`196`	`+ {`
	`197`	+ config: `
	`198`	`+{`
	`199`	`+ "architecture": "amd64",`
	`200`	`+ "os": "linux",`
	`201`	`+ "rootfs": {`
	`202`	`+ "diff_ids": [`
	`203`	`+ "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"`
	`204`	`+ ],`
	`205`	`+ "type": "layers"`
	`206`	`+ }`
	`207`	`+}`
`154`	`208`	`,
`155`	`209`	`fail: false,`
`156`	`210`	`},`