Browse code

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>

Sebastiaan van Stijn authored on 2019/09/02 18:54:52
Showing 1 changed files
... ...
@@ -28,7 +28,6 @@ import (
28 28
 	"github.com/docker/docker/integration-cli/cli"
29 29
 	"github.com/docker/docker/integration-cli/cli/build"
30 30
 	"github.com/docker/docker/pkg/mount"
31
-	"github.com/docker/docker/pkg/parsers/kernel"
32 31
 	"github.com/docker/docker/pkg/stringid"
33 32
 	"github.com/docker/docker/runconfig"
34 33
 	"github.com/docker/docker/testutil"
... ...
@@ -3916,20 +3915,6 @@ func (s *DockerSuite) TestRunNamedVolumesFromNotRemoved(c *testing.T) {
3916 3916
 }
3917 3917
 
3918 3918
 func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {
3919
-	if runtime.GOOS == "windows" {
3920
-		// TODO @msabansal - https://github.com/moby/moby/issues/35023. Duplicate
3921
-		// port mappings are not errored out on RS3 builds. Temporarily disabling
3922
-		// this test pending further investigation. Note we parse kernel.GetKernelVersion
3923
-		// rather than osversion.Build() as test binaries aren't manifested, so would
3924
-		// otherwise report build 9200.
3925
-		v, err := kernel.GetKernelVersion()
3926
-		assert.NilError(c, err)
3927
-		buildNumber, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0])
3928
-		if buildNumber == osversion.RS3 {
3929
-			c.Skip("Temporarily disabled on RS3 builds")
3930
-		}
3931
-	}
3932
-
3933 3919
 	nroutines, err := getGoroutineNumber()
3934 3920
 	assert.NilError(c, err)
3935 3921