Merge pull request opencontainers#587 from q384566678/process-cur-max

liangchenye · web-flow · commit 444b9964ec3a · 2018-03-05T20:13:38.000+08:00
Implement PosixProcRlimitsSoftMatchCur and PosixProcRlimitsHardMatchMax
diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go
@@ -279,10 +279,10 @@ func validateRlimits(spec *rspec.Spec) error {
 		}
 
 		if rlimit.Cur != r.Soft {
-			return fmt.Errorf("%v rlimit soft expected: %v, actual: %v", r.Type, r.Soft, rlimit.Cur)
+			return specerror.NewError(specerror.PosixProcRlimitsSoftMatchCur, fmt.Errorf("%v rlimit soft expected: %v, actual: %v", r.Type, r.Soft, rlimit.Cur), rspec.Version)
 		}
 		if rlimit.Max != r.Hard {
-			return fmt.Errorf("%v rlimit hard expected: %v, actual: %v", r.Type, r.Hard, rlimit.Max)
+			return specerror.NewError(specerror.PosixProcRlimitsHardMatchMax, fmt.Errorf("%v rlimit hard expected: %v, actual: %v", r.Type, r.Hard, rlimit.Max), rspec.Version)
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,10 @@ func validateRlimits(spec *rspec.Spec) error {`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`if rlimit.Cur != r.Soft {`
`282`		`- return fmt.Errorf("%v rlimit soft expected: %v, actual: %v", r.Type, r.Soft, rlimit.Cur)`
	`282`	`+ return specerror.NewError(specerror.PosixProcRlimitsSoftMatchCur, fmt.Errorf("%v rlimit soft expected: %v, actual: %v", r.Type, r.Soft, rlimit.Cur), rspec.Version)`
`283`	`283`	`}`
`284`	`284`	`if rlimit.Max != r.Hard {`
`285`		`- return fmt.Errorf("%v rlimit hard expected: %v, actual: %v", r.Type, r.Hard, rlimit.Max)`
	`285`	`+ return specerror.NewError(specerror.PosixProcRlimitsHardMatchMax, fmt.Errorf("%v rlimit hard expected: %v, actual: %v", r.Type, r.Hard, rlimit.Max), rspec.Version)`
`286`	`286`	`}`
`287`	`287`	`}`
`288`	`288`	`return nil`