1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Windows CI: Enable TestHistory* cli tests

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2016-01-26 12:42:09 -08:00
parent b5420be597
commit 15c32f39a9

View file

@ -13,7 +13,6 @@ import (
// This is a heisen-test. Because the created timestamp of images and the behavior of // This is a heisen-test. Because the created timestamp of images and the behavior of
// sort is not predictable it doesn't always fail. // sort is not predictable it doesn't always fail.
func (s *DockerSuite) TestBuildHistory(c *check.C) { func (s *DockerSuite) TestBuildHistory(c *check.C) {
testRequires(c, DaemonIsLinux)
name := "testbuildhistory" name := "testbuildhistory"
_, err := buildImage(name, `FROM busybox _, err := buildImage(name, `FROM busybox
RUN echo "A" RUN echo "A"
@ -59,7 +58,6 @@ RUN echo "Z"`,
} }
func (s *DockerSuite) TestHistoryExistentImage(c *check.C) { func (s *DockerSuite) TestHistoryExistentImage(c *check.C) {
testRequires(c, DaemonIsLinux)
dockerCmd(c, "history", "busybox") dockerCmd(c, "history", "busybox")
} }
@ -69,7 +67,6 @@ func (s *DockerSuite) TestHistoryNonExistentImage(c *check.C) {
} }
func (s *DockerSuite) TestHistoryImageWithComment(c *check.C) { func (s *DockerSuite) TestHistoryImageWithComment(c *check.C) {
testRequires(c, DaemonIsLinux)
name := "testhistoryimagewithcomment" name := "testhistoryimagewithcomment"
// make a image through docker commit <container id> [ -m messages ] // make a image through docker commit <container id> [ -m messages ]
@ -89,7 +86,6 @@ func (s *DockerSuite) TestHistoryImageWithComment(c *check.C) {
} }
func (s *DockerSuite) TestHistoryHumanOptionFalse(c *check.C) { func (s *DockerSuite) TestHistoryHumanOptionFalse(c *check.C) {
testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "history", "--human=false", "busybox") out, _ := dockerCmd(c, "history", "--human=false", "busybox")
lines := strings.Split(out, "\n") lines := strings.Split(out, "\n")
sizeColumnRegex, _ := regexp.Compile("SIZE +") sizeColumnRegex, _ := regexp.Compile("SIZE +")
@ -108,7 +104,6 @@ func (s *DockerSuite) TestHistoryHumanOptionFalse(c *check.C) {
} }
func (s *DockerSuite) TestHistoryHumanOptionTrue(c *check.C) { func (s *DockerSuite) TestHistoryHumanOptionTrue(c *check.C) {
testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "history", "--human=true", "busybox") out, _ := dockerCmd(c, "history", "--human=true", "busybox")
lines := strings.Split(out, "\n") lines := strings.Split(out, "\n")
sizeColumnRegex, _ := regexp.Compile("SIZE +") sizeColumnRegex, _ := regexp.Compile("SIZE +")