From e19060dceacf79e1384e4aa224c76e4bcc6f86e9 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Wed, 12 Aug 2015 18:32:23 -0700 Subject: Revert #14884 This reverts commit 810d3b2642d4a82dc186d6eff8c2e487ee624bc5. Signed-off-by: Arnaud Porterie --- integration-cli/docker_cli_push_test.go | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'integration-cli/docker_cli_push_test.go') diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index ed4d24a856..31d4147ed2 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -60,32 +60,7 @@ func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) { dockerCmd(c, "tag", "busybox", repoTag2) - out, _ := dockerCmd(c, "push", repoName) - - // There should be no duplicate hashes in the output - imageSuccessfullyPushed := ": Image successfully pushed" - imageAlreadyExists := ": Image already exists" - imagePushHashes := make(map[string]struct{}) - outputLines := strings.Split(out, "\n") - for _, outputLine := range outputLines { - if strings.Contains(outputLine, imageSuccessfullyPushed) { - hash := strings.TrimSuffix(outputLine, imageSuccessfullyPushed) - if _, present := imagePushHashes[hash]; present { - c.Fatalf("Duplicate image push: %s", outputLine) - } - imagePushHashes[hash] = struct{}{} - } else if strings.Contains(outputLine, imageAlreadyExists) { - hash := strings.TrimSuffix(outputLine, imageAlreadyExists) - if _, present := imagePushHashes[hash]; present { - c.Fatalf("Duplicate image push: %s", outputLine) - } - imagePushHashes[hash] = struct{}{} - } - } - - if len(imagePushHashes) == 0 { - c.Fatal(`Expected at least one line containing "Image successfully pushed"`) - } + dockerCmd(c, "push", repoName) } func (s *DockerRegistrySuite) TestPushInterrupt(c *check.C) { -- cgit v1.2.1 From a9aaa6678073d2cac4b9c5d86eb012f0aa024ccb Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Wed, 12 Aug 2015 18:36:46 -0700 Subject: Update regression test Signed-off-by: Arnaud Porterie --- integration-cli/docker_cli_push_test.go | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'integration-cli/docker_cli_push_test.go') diff --git a/integration-cli/docker_cli_push_test.go b/integration-cli/docker_cli_push_test.go index 31d4147ed2..111e9f33d3 100644 --- a/integration-cli/docker_cli_push_test.go +++ b/integration-cli/docker_cli_push_test.go @@ -61,6 +61,40 @@ func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) { dockerCmd(c, "tag", "busybox", repoTag2) dockerCmd(c, "push", repoName) + + // Ensure layer list is equivalent for repoTag1 and repoTag2 + out1, _ := dockerCmd(c, "pull", repoTag1) + if strings.Contains(out1, "Tag t1 not found") { + c.Fatalf("Unable to pull pushed image: %s", out1) + } + imageAlreadyExists := ": Image already exists" + var out1Lines []string + for _, outputLine := range strings.Split(out1, "\n") { + if strings.Contains(outputLine, imageAlreadyExists) { + out1Lines = append(out1Lines, outputLine) + } + } + + out2, _ := dockerCmd(c, "pull", repoTag2) + if strings.Contains(out2, "Tag t2 not found") { + c.Fatalf("Unable to pull pushed image: %s", out1) + } + var out2Lines []string + for _, outputLine := range strings.Split(out2, "\n") { + if strings.Contains(outputLine, imageAlreadyExists) { + out1Lines = append(out1Lines, outputLine) + } + } + + if len(out1Lines) != len(out2Lines) { + c.Fatalf("Mismatched output length:\n%s\n%s", out1, out2) + } + + for i := range out1Lines { + if out1Lines[i] != out2Lines[i] { + c.Fatalf("Mismatched output line:\n%s\n%s", out1Lines[i], out2Lines[i]) + } + } } func (s *DockerRegistrySuite) TestPushInterrupt(c *check.C) { -- cgit v1.2.1