From 59f4369f1a09462ec0a2c6777931051fc1324396 Mon Sep 17 00:00:00 2001 From: John Howard Date: Sun, 31 Jan 2016 15:51:56 -0800 Subject: [PATCH] Windows CI: Turn off unreliable TP4 tests Signed-off-by: John Howard --- integration-cli/docker_cli_events_test.go | 2 ++ integration-cli/docker_cli_ps_test.go | 25 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index 80ff40e92e..cb0f45cd2d 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -428,6 +428,8 @@ func (s *DockerSuite) TestEventsResize(c *check.C) { } func (s *DockerSuite) TestEventsAttach(c *check.C) { + // TODO Windows CI: Figure out why this test fails intermittently (TP4 and TP5). + testRequires(c, DaemonIsLinux) since := daemonTime(c).Unix() out, _ := dockerCmd(c, "run", "-di", "busybox", "cat") diff --git a/integration-cli/docker_cli_ps_test.go b/integration-cli/docker_cli_ps_test.go index 9089d60fdc..5adab0b5b3 100644 --- a/integration-cli/docker_cli_ps_test.go +++ b/integration-cli/docker_cli_ps_test.go @@ -17,7 +17,9 @@ import ( ) func (s *DockerSuite) TestPsListContainersBase(c *check.C) { - // Problematic on Windows as busybox doesn't support top + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. testRequires(c, DaemonIsLinux) out, _ := dockerCmd(c, "run", "-d", "busybox", "top") firstID := strings.TrimSpace(out) @@ -170,6 +172,10 @@ func (s *DockerSuite) TestPsListContainersSize(c *check.C) { } func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) { + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. + testRequires(c, DaemonIsLinux) // start exited container out, _ := dockerCmd(c, "run", "-d", "busybox") firstID := strings.TrimSpace(out) @@ -209,6 +215,10 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) { } func (s *DockerSuite) TestPsListContainersFilterID(c *check.C) { + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. + testRequires(c, DaemonIsLinux) // start container out, _ := dockerCmd(c, "run", "-d", "busybox") firstID := strings.TrimSpace(out) @@ -247,6 +257,10 @@ func (s *DockerSuite) TestPsListContainersFilterName(c *check.C) { // - Run containers for each of those image (busybox, images_ps_filter_test1, images_ps_filter_test2) // - Filter them out :P func (s *DockerSuite) TestPsListContainersFilterAncestorImage(c *check.C) { + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. + testRequires(c, DaemonIsLinux) // Build images imageName1 := "images_ps_filter_test1" imageID1, err := buildImage(imageName1, @@ -342,6 +356,10 @@ func checkPsAncestorFilterOutput(c *check.C, out string, filterName string, expe } func (s *DockerSuite) TestPsListContainersFilterLabel(c *check.C) { + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. + testRequires(c, DaemonIsLinux) // start container out, _ := dockerCmd(c, "run", "-d", "-l", "match=me", "-l", "second=tag", "busybox") firstID := strings.TrimSpace(out) @@ -378,7 +396,10 @@ func (s *DockerSuite) TestPsListContainersFilterLabel(c *check.C) { } func (s *DockerSuite) TestPsListContainersFilterExited(c *check.C) { - // TODO Windows CI: Enable for TP5. Fails on TP4 + // TODO Windows CI (TP5 timeframe). This test has a very high likelyhood + // of hitting a known bug in TP4. Hence disabling for now until TP5 + // is available. + testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux) runSleepingContainer(c, "--name=sleep")