Merge pull request #419 from andrewhsu/xit
[19.03] Windows: disable flaky test TestStartReturnCorrectExitCode
diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go
index 9d59e83..72a5d77 100644
--- a/integration-cli/docker_cli_start_test.go
+++ b/integration-cli/docker_cli_start_test.go
@@ -2,11 +2,14 @@
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) 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")
