From 6cc38775bbff9b9304e551b26593af9c867c61bb Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 2 Sep 2015 15:29:40 -0700 Subject: [PATCH] Remove TestPushInterrupt This test relies on a race condition, and has been failing often in CI. Signed-off-by: Aaron Lehmann --- integration-cli/docker_cli_push_test.go | 27 ------------------------- 1 file changed, 27 deletions(-) diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index 246506822e..b5c4b527cb 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -97,33 +97,6 @@ func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) { } } -func (s *DockerRegistrySuite) TestPushInterrupt(c *check.C) { - repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL) - // tag the image and upload it to the private registry - dockerCmd(c, "tag", "busybox", repoName) - - pushCmd := exec.Command(dockerBinary, "push", repoName) - if err := pushCmd.Start(); err != nil { - c.Fatalf("Failed to start pushing to private registry: %v", err) - } - - // Interrupt push (yes, we have no idea at what point it will get killed). - time.Sleep(50 * time.Millisecond) // dependent on race condition. - if err := pushCmd.Process.Kill(); err != nil { - c.Fatalf("Failed to kill push process: %v", err) - } - if out, _, err := dockerCmdWithError("push", repoName); err == nil { - if !strings.Contains(out, "already in progress") { - c.Fatalf("Push should be continued on daemon side, but seems ok: %v, %s", err, out) - } - } - // now wait until all this pushes will complete - // if it failed with timeout - there would be some error, - // so no logic about it here - for exec.Command(dockerBinary, "push", repoName).Run() != nil { - } -} - func (s *DockerRegistrySuite) TestPushEmptyLayer(c *check.C) { repoName := fmt.Sprintf("%v/dockercli/emptylayer", privateRegistryURL) emptyTarball, err := ioutil.TempFile("", "empty_tarball")