Merge pull request #35072 from tophj-ibm/fix-kernel-version-detection

[integration-cli] fix s390x flaky test
This commit is contained in:
Sebastiaan van Stijn 2017-10-03 23:46:10 +02:00 committed by GitHub
commit d65ab869e8

View file

@ -180,7 +180,7 @@ func GetKernelVersion() *kernel.VersionInfo {
// CheckKernelVersion checks if current kernel is newer than (or equal to)
// the given version.
func CheckKernelVersion(k, major, minor int) bool {
return kernel.CompareKernelVersion(*GetKernelVersion(), kernel.VersionInfo{Kernel: k, Major: major, Minor: minor}) > 0
return kernel.CompareKernelVersion(*GetKernelVersion(), kernel.VersionInfo{Kernel: k, Major: major, Minor: minor}) >= 0
}
func (s *DockerSuite) TestUpdateSwapMemoryOnly(c *check.C) {