From 031ef2dc8e0510280c9e55d07b8287e0a73c7fcc Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 21 Oct 2019 16:09:49 +0000 Subject: [PATCH] Windows: disable flaky test TestStartReturnCorrectExitCode Signed-off-by: Andrew Hsu (cherry picked from commit 1be272ef76ec7f37d680525e725c1a17a85a32cf) Signed-off-by: Andrew Hsu --- integration-cli/docker_cli_start_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index 9d59e836fc..72a5d77d34 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -2,11 +2,14 @@ package main import ( "fmt" + "runtime" + "strconv" "strings" "testing" "time" "github.com/docker/docker/integration-cli/cli" + "github.com/docker/docker/pkg/parsers/kernel" "gotest.tools/assert" "gotest.tools/icmd" ) @@ -186,6 +189,18 @@ func (s *DockerSuite) TestStartAttachWithRename(c *testing.T) { } func (s *DockerSuite) TestStartReturnCorrectExitCode(c *testing.T) { + // Note we parse kernel.GetKernelVersion rather than system.GetOSVersion + // as test binaries aren't manifested, so would otherwise report the wrong + // build number. + if runtime.GOOS == "windows" { + v, err := kernel.GetKernelVersion() + assert.NilError(c, err) + build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) + if build < 16299 { + c.Skip("FLAKY on Windows RS1, see #38521") + } + } + dockerCmd(c, "create", "--restart=on-failure:2", "--name", "withRestart", "busybox", "sh", "-c", "exit 11") dockerCmd(c, "create", "--rm", "--name", "withRm", "busybox", "sh", "-c", "exit 12")