Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| ... | ... |
@@ -4,6 +4,8 @@ import ( |
| 4 | 4 |
"context" |
| 5 | 5 |
"net/http" |
| 6 | 6 |
"net/http/httptest" |
| 7 |
+ "runtime" |
|
| 8 |
+ "strconv" |
|
| 7 | 9 |
"strings" |
| 8 | 10 |
|
| 9 | 11 |
"github.com/docker/docker/api/types" |
| ... | ... |
@@ -13,6 +15,7 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/integration-cli/cli" |
| 14 | 14 |
"github.com/docker/docker/integration-cli/cli/build" |
| 15 | 15 |
"github.com/docker/docker/internal/test/request" |
| 16 |
+ "github.com/docker/docker/pkg/parsers/kernel" |
|
| 16 | 17 |
"github.com/go-check/check" |
| 17 | 18 |
) |
| 18 | 19 |
|
| ... | ... |
@@ -55,6 +58,15 @@ func (s *DockerSuite) TestAPIImagesFilter(c *check.C) {
|
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 | 57 |
func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) {
|
| 58 |
+ if runtime.GOOS == "windows" {
|
|
| 59 |
+ v, err := kernel.GetKernelVersion() |
|
| 60 |
+ c.Assert(err, checker.IsNil) |
|
| 61 |
+ build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) |
|
| 62 |
+ if build == 16299 {
|
|
| 63 |
+ c.Skip("Temporarily disabled on RS3 builds")
|
|
| 64 |
+ } |
|
| 65 |
+ } |
|
| 66 |
+ |
|
| 58 | 67 |
testRequires(c, Network) |
| 59 | 68 |
buildImageSuccessfully(c, "saveandload", build.WithDockerfile("FROM busybox\nENV FOO bar"))
|
| 60 | 69 |
id := getIDByName(c, "saveandload") |
| ... | ... |
@@ -126,6 +138,15 @@ func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {
|
| 126 | 126 |
} |
| 127 | 127 |
|
| 128 | 128 |
func (s *DockerSuite) TestAPIImagesImportBadSrc(c *check.C) {
|
| 129 |
+ if runtime.GOOS == "windows" {
|
|
| 130 |
+ v, err := kernel.GetKernelVersion() |
|
| 131 |
+ c.Assert(err, checker.IsNil) |
|
| 132 |
+ build, _ := strconv.Atoi(strings.Split(strings.SplitN(v.String(), " ", 3)[2][1:], ".")[0]) |
|
| 133 |
+ if build == 16299 {
|
|
| 134 |
+ c.Skip("Temporarily disabled on RS3 builds")
|
|
| 135 |
+ } |
|
| 136 |
+ } |
|
| 137 |
+ |
|
| 129 | 138 |
testRequires(c, Network, SameHostDaemon) |
| 130 | 139 |
|
| 131 | 140 |
server := httptest.NewServer(http.NewServeMux()) |