Merge pull request moby#5559 from bmurphy1976/bmurphy1976-history-bug

Michael Crosby · Michael Crosby · commit d803523cdca3 · 2014-06-18T14:34:00.000-07:00
Test and fix history command ordering
diff --git a/integration-cli/build_tests/TestBuildHistory/Dockerfile b/integration-cli/build_tests/TestBuildHistory/Dockerfile
@@ -0,0 +1,28 @@
+FROM busybox
+
+RUN echo "A"
+RUN echo "B"
+RUN echo "C"
+RUN echo "D"
+RUN echo "E"
+RUN echo "F"
+RUN echo "G"
+RUN echo "H"
+RUN echo "I"
+RUN echo "J"
+RUN echo "K"
+RUN echo "L"
+RUN echo "M"
+RUN echo "N"
+RUN echo "O"
+RUN echo "P"
+RUN echo "Q"
+RUN echo "R"
+RUN echo "S"
+RUN echo "T"
+RUN echo "U"
+RUN echo "V"
+RUN echo "W"
+RUN echo "X"
+RUN echo "Y"
+RUN echo "Z"
diff --git a/integration-cli/docker_cli_history_test.go b/integration-cli/docker_cli_history_test.go
@@ -0,0 +1,43 @@
+package main
+
+import (
+	"fmt"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// This is a heisen-test.  Because the created timestamp of images and the behavior of
+// sort is not predictable it doesn't always fail.
+func TestBuildHistory(t *testing.T) {
+	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildHistory")
+	buildCmd := exec.Command(dockerBinary, "build", "-t", "testbuildhistory", ".")
+
+	buildCmd.Dir = buildDirectory
+	out, exitCode, err := runCommandWithOutput(buildCmd)
+	errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
+	if err != nil || exitCode != 0 {
+		t.Fatal("failed to build the image")
+	}
+
+	out, exitCode, err = runCommandWithOutput(exec.Command(dockerBinary, "history", "testbuildhistory"))
+	errorOut(err, t, fmt.Sprintf("image history failed: %v %v", out, err))
+	if err != nil || exitCode != 0 {
+		t.Fatal("failed to get image history")
+	}
+
+	actual_values := strings.Split(out, "\n")[1:27]
+	expected_values := [26]string{"Z", "Y", "X", "W", "V", "U", "T", "S", "R", "Q", "P", "O", "N", "M", "L", "K", "J", "I", "H", "G", "F", "E", "D", "C", "B", "A"}
+
+	for i := 0; i < 26; i++ {
+		echo_value := fmt.Sprintf("echo \"%s\"", expected_values[i])
+		actual_value := actual_values[i]
+
+		if !strings.Contains(actual_value, echo_value) {
+			t.Fatalf("Expected layer \"%s\", but was: %s", expected_values[i], actual_value)
+		}
+	}
+
+	deleteImages("testbuildhistory")
+}
diff --git a/server/server.go b/server/server.go
@@ -818,7 +818,6 @@ func (srv *Server) ImageHistory(job *engine.Job) engine.Status {
 		outs.Add(out)
 		return nil
 	})
-	outs.ReverseSort()
 	if _, err := outs.WriteListTo(job.Stdout); err != nil {
 		return job.Error(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,6 @@ func (srv Server) ImageHistory(job engine.Job) engine.Status {`
`818`	`818`	`outs.Add(out)`
`819`	`819`	`return nil`
`820`	`820`	`})`
`821`		`- outs.ReverseSort()`
`822`	`821`	`if _, err := outs.WriteListTo(job.Stdout); err != nil {`
`823`	`822`	`return job.Error(err)`
`824`	`823`	`}`