Merge pull request #509 from wking/remove-rlimits-windows-warning

Zhou Hao · web-flow · commit 801e6fd934dc · 2017-11-06T09:37:31.000+08:00
runtimetest: Make validateRlimits silent on Windows
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -267,12 +267,11 @@ func validateHostname(spec *rspec.Spec) error {
 }
 
 func validateRlimits(spec *rspec.Spec) error {
-	if spec.Process == nil {
+	if runtime.GOOS == "windows" {
 		return nil
 	}
 
-	if runtime.GOOS != "linux" && runtime.GOOS != "solaris" {
-		logrus.Warnf("process.rlimits validation not yet implemented for OS %q", runtime.GOOS)
+	if spec.Process == nil {
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -267,12 +267,11 @@ func validateHostname(spec *rspec.Spec) error {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`func validateRlimits(spec *rspec.Spec) error {`
`270`		`- if spec.Process == nil {`
	`270`	`+ if runtime.GOOS == "windows" {`
`271`	`271`	`return nil`
`272`	`272`	`}`
`273`	`273`
`274`		`- if runtime.GOOS != "linux" && runtime.GOOS != "solaris" {`
`275`		`- logrus.Warnf("process.rlimits validation not yet implemented for OS %q", runtime.GOOS)`
	`274`	`+ if spec.Process == nil {`
`276`	`275`	`return nil`
`277`	`276`	`}`
`278`	`277`