Selaa lähdekoodia

Merge pull request #19867 from Microsoft/jjh/disableunreliabletests

Windows CI: Turn off unreliable TP4 tests
Vincent Demeester 9 vuotta sitten
vanhempi
commit
ec67c8c4b6

+ 2 - 0
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) {
 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()
 	since := daemonTime(c).Unix()
 
 
 	out, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
 	out, _ := dockerCmd(c, "run", "-di", "busybox", "cat")

+ 23 - 2
integration-cli/docker_cli_ps_test.go

@@ -17,7 +17,9 @@ import (
 )
 )
 
 
 func (s *DockerSuite) TestPsListContainersBase(c *check.C) {
 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)
 	testRequires(c, DaemonIsLinux)
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 	firstID := strings.TrimSpace(out)
 	firstID := strings.TrimSpace(out)
@@ -170,6 +172,10 @@ func (s *DockerSuite) TestPsListContainersSize(c *check.C) {
 }
 }
 
 
 func (s *DockerSuite) TestPsListContainersFilterStatus(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
 	// start exited container
 	out, _ := dockerCmd(c, "run", "-d", "busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox")
 	firstID := strings.TrimSpace(out)
 	firstID := strings.TrimSpace(out)
@@ -209,6 +215,10 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) {
 }
 }
 
 
 func (s *DockerSuite) TestPsListContainersFilterID(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
 	// start container
 	out, _ := dockerCmd(c, "run", "-d", "busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox")
 	firstID := strings.TrimSpace(out)
 	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)
 // - Run containers for each of those image (busybox, images_ps_filter_test1, images_ps_filter_test2)
 // - Filter them out :P
 // - Filter them out :P
 func (s *DockerSuite) TestPsListContainersFilterAncestorImage(c *check.C) {
 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
 	// Build images
 	imageName1 := "images_ps_filter_test1"
 	imageName1 := "images_ps_filter_test1"
 	imageID1, err := buildImage(imageName1,
 	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) {
 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
 	// start container
 	out, _ := dockerCmd(c, "run", "-d", "-l", "match=me", "-l", "second=tag", "busybox")
 	out, _ := dockerCmd(c, "run", "-d", "-l", "match=me", "-l", "second=tag", "busybox")
 	firstID := strings.TrimSpace(out)
 	firstID := strings.TrimSpace(out)
@@ -378,7 +396,10 @@ func (s *DockerSuite) TestPsListContainersFilterLabel(c *check.C) {
 }
 }
 
 
 func (s *DockerSuite) TestPsListContainersFilterExited(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)
 	testRequires(c, DaemonIsLinux)
 	runSleepingContainer(c, "--name=sleep")
 	runSleepingContainer(c, "--name=sleep")