From 9e587fa72b8cc42895681efe3d0b9fdcdfe3b06d Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 28 Sep 2017 09:42:58 -0700 Subject: [PATCH] Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 1ad5ce7ebd..8198fded72 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -27,6 +27,7 @@ import ( "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/integration-cli/cli/build/fakecontext" "github.com/docker/docker/pkg/mount" + "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringutils" "github.com/docker/docker/runconfig" @@ -4010,6 +4011,20 @@ func (s *DockerSuite) TestRunNamedVolumesFromNotRemoved(c *check.C) { } func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) { + // TODO @msabansal - https://github.com/moby/moby/issues/35023. Duplicate + // port mappings are not errored out on RS3 builds. Temporarily disabling + // this test pending further investigation. Note we parse kernel.GetKernelVersion + // rather than system.GetOSVersion as test binaries aren't manifested, so would + // otherwise report build 9200. + if runtime.GOOS == "windows" { + v, err := kernel.GetKernelVersion() + c.Assert(err, checker.IsNil) + build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) + if build >= 16292 { // @jhowardmsft TODO - replace with final RS3 build and == + c.Skip("Temporarily disabled on RS3 builds") + } + } + nroutines, err := getGoroutineNumber() c.Assert(err, checker.IsNil)