From 1b05ea472703ddc47ec5052bc031fc23e60356c4 Mon Sep 17 00:00:00 2001 From: John Stephens Date: Wed, 9 May 2018 14:03:48 -0700 Subject: [PATCH] Temporarily disable failing tests on Windows RS3 Signed-off-by: John Stephens Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_api_images_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index da1c8c8f28..f306cca617 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -4,6 +4,8 @@ import ( "context" "net/http" "net/http/httptest" + "runtime" + "strconv" "strings" "github.com/docker/docker/api/types" @@ -13,6 +15,7 @@ import ( "github.com/docker/docker/integration-cli/cli" "github.com/docker/docker/integration-cli/cli/build" "github.com/docker/docker/internal/test/request" + "github.com/docker/docker/pkg/parsers/kernel" "github.com/go-check/check" ) @@ -55,6 +58,15 @@ func (s *DockerSuite) TestAPIImagesFilter(c *check.C) { } func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) { + 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 == 16299 { + c.Skip("Temporarily disabled on RS3 builds") + } + } + testRequires(c, Network) buildImageSuccessfully(c, "saveandload", build.WithDockerfile("FROM busybox\nENV FOO bar")) id := getIDByName(c, "saveandload") @@ -126,6 +138,15 @@ func (s *DockerSuite) TestAPIImagesHistory(c *check.C) { } func (s *DockerSuite) TestAPIImagesImportBadSrc(c *check.C) { + 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 == 16299 { + c.Skip("Temporarily disabled on RS3 builds") + } + } + testRequires(c, Network, SameHostDaemon) server := httptest.NewServer(http.NewServeMux())