From aa5ea652c8864f014e1fa480d7e504f0d742c170 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 3 Oct 2017 12:09:16 -0400 Subject: [PATCH] [integration-cli] fix s390x flaky test s390x node-1 has kernel 4.6.0, kernel.CompareKernelVersion() returns 0 if the kernels are equal, so include that. Full logic for CompareKernelVersion() is a > b ret 1, a == b ret 0, a < b ret -1 Signed-off-by: Christopher Jones --- integration-cli/docker_cli_update_unix_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index c3dfbcc9c5..0d2d30f824 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -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) {