diff options
| author | John Howard <jhoward@microsoft.com> | 2016-01-22 21:13:38 -0800 |
|---|---|---|
| committer | John Howard <jhoward@microsoft.com> | 2016-01-22 21:13:38 -0800 |
| commit | 80b057067104b08886fbcf16d060ce82c0efb7c9 (patch) | |
| tree | a89adb177feb000f774fdfb76c34093ea7e7b76a /integration-cli/docker_api_images_test.go | |
| parent | bf85a49509ef67eb68a2251928385a221a85254e (diff) | |
| download | docker-80b057067104b08886fbcf16d060ce82c0efb7c9.tar.gz | |
Windows CI: Porting for docker_api_images_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Diffstat (limited to 'integration-cli/docker_api_images_test.go')
| -rw-r--r-- | integration-cli/docker_api_images_test.go | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 61298d3c68..a0de5c1a5a 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -12,7 +12,6 @@ import ( ) func (s *DockerSuite) TestApiImagesFilter(c *check.C) { - testRequires(c, DaemonIsLinux) name := "utest:tag1" name2 := "utest/docker:tag2" name3 := "utest:5000/docker:tag3" @@ -49,9 +48,10 @@ func (s *DockerSuite) TestApiImagesFilter(c *check.C) { } func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) { + // TODO Windows to Windows CI: Investigate further why this test fails. testRequires(c, Network) testRequires(c, DaemonIsLinux) - out, err := buildImage("saveandload", "FROM hello-world\nENV FOO bar", false) + out, err := buildImage("saveandload", "FROM busybox\nENV FOO bar", false) c.Assert(err, checker.IsNil) id := strings.TrimSpace(out) @@ -72,10 +72,11 @@ func (s *DockerSuite) TestApiImagesSaveAndLoad(c *check.C) { } func (s *DockerSuite) TestApiImagesDelete(c *check.C) { - testRequires(c, Network) - testRequires(c, DaemonIsLinux) + if daemonPlatform != "windows" { + testRequires(c, Network) + } name := "test-api-images-delete" - out, err := buildImage(name, "FROM hello-world\nENV FOO bar", false) + out, err := buildImage(name, "FROM busybox\nENV FOO bar", false) c.Assert(err, checker.IsNil) id := strings.TrimSpace(out) @@ -95,10 +96,11 @@ func (s *DockerSuite) TestApiImagesDelete(c *check.C) { } func (s *DockerSuite) TestApiImagesHistory(c *check.C) { - testRequires(c, Network) - testRequires(c, DaemonIsLinux) + if daemonPlatform != "windows" { + testRequires(c, Network) + } name := "test-api-images-history" - out, err := buildImage(name, "FROM hello-world\nENV FOO bar", false) + out, err := buildImage(name, "FROM busybox\nENV FOO bar", false) c.Assert(err, checker.IsNil) id := strings.TrimSpace(out) |