Merge pull request #964 from zhaoleidd/test_fix

hqhq · web-flow · commit 8033a839758a · 2016-07-26T11:30:17.000+08:00
UNITTEST: Bypass userns test on platform without userns support
diff --git a/libcontainer/configs/validate/validator_test.go b/libcontainer/configs/validate/validator_test.go
@@ -148,6 +148,9 @@ func TestValidateSecurityWithoutNEWNS(t *testing.T) {
 }
 
 func TestValidateUsernamespace(t *testing.T) {
+	if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+		t.Skip("userns is unsupported")
+	}
 	config := &configs.Config{
 		Rootfs: "/var",
 		Namespaces: configs.Namespaces(

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,9 @@ func TestValidateSecurityWithoutNEWNS(t *testing.T) {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`func TestValidateUsernamespace(t *testing.T) {`
	`151`	`+ if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {`
	`152`	`+ t.Skip("userns is unsupported")`
	`153`	`+ }`
`151`	`154`	`config := &configs.Config{`
`152`	`155`	`Rootfs: "/var",`
`153`	`156`	`Namespaces: configs.Namespaces(`