kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
[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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_cli_update_unix_test.go
View file

@ -180,7 +180,7 @@ func GetKernelVersion() *kernel.VersionInfo {
// CheckKernelVersion checks if current kernel is newer than (or equal to) // CheckKernelVersion checks if current kernel is newer than (or equal to)
// the given version. // the given version.
func CheckKernelVersion(k, major, minor int) bool { 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) { func (s *DockerSuite) TestUpdateSwapMemoryOnly(c *check.C) {