diff options
author | Sebastiaan van Stijn <github@gone.nl> | 2019-09-02 11:54:52 +0200 |
---|---|---|
committer | Sebastiaan van Stijn <github@gone.nl> | 2019-12-12 21:10:09 +0100 |
commit | cbd37fbc9a28d506c4e157a8e986ed3419fe607b (patch) | |
tree | 7404cf9237af63257b1c26f7f631089ed9027866 | |
parent | b95fad8e51bd064be4f4e58a996924f343846c85 (diff) | |
download | docker-cbd37fbc9a28d506c4e157a8e986ed3419fe607b.tar.gz |
integration-cli: re-enable TestRunAttachFailedNoLeak on RS3
This test was temporarily disabled (see moby/moby#35023) because of a bug in
Windows RS3 and RS4 causing duplicate port mappings to not be detected, and
not causing an error.
This bug was fixed as MSFT:14083260 on 10/31/2017, and backported to RS3 in
November/December 2017.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r-- | integration-cli/docker_cli_run_test.go | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index bef7e85834..33fe9f2488 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -28,7 +28,6 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/pkg/mount" - "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/runconfig" "github.com/docker/docker/testutil" @@ -3916,20 +3915,6 @@ func (s *DockerSuite) TestRunNamedVolumesFromNotRemoved(c *testing.T) { } func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) { - if runtime.GOOS == "windows" { - // 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 osversion.Build() as test binaries aren't manifested, so would - // otherwise report build 9200. - v, err := kernel.GetKernelVersion() - assert.NilError(c, err) - buildNumber, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) - if buildNumber == osversion.RS3 { - c.Skip("Temporarily disabled on RS3 builds") - } - } - nroutines, err := getGoroutineNumber() assert.NilError(c, err) |