From 482d9b0df3eb596021f74fa97dbee01ebf508ed3 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 17:36:14 -0800 Subject: [PATCH 1/6] Be consistent about libtrust import path. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 7c7026bd2255cef47cbb026afe0b984d4c9a9130 Component: engine --- components/engine/api/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/common.go b/components/engine/api/common.go index 3a46a8a523..71e72f69e0 100644 --- a/components/engine/api/common.go +++ b/components/engine/api/common.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/engine" "github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/version" - "github.com/docker/docker/vendor/src/github.com/docker/libtrust" + "github.com/docker/libtrust" ) const ( From 4cd694cddb00d817d6756252d98bfa1c8a18984f Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 17:42:25 -0800 Subject: [PATCH 2/6] cleanup: remove startCommand function, only used once, and unecessary abstraction. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 7ba9a18ade7393d942d995d34a92d757ef4af0b7 Component: engine --- .../engine/integration-cli/docker_cli_attach_test.go | 2 +- components/engine/integration-cli/utils.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_attach_test.go b/components/engine/integration-cli/docker_cli_attach_test.go index 510f02ab18..d03a986e48 100644 --- a/components/engine/integration-cli/docker_cli_attach_test.go +++ b/components/engine/integration-cli/docker_cli_attach_test.go @@ -50,7 +50,7 @@ func TestAttachMultipleAndRestart(t *testing.T) { t.Fatal(err) } - if _, err := startCommand(c); err != nil { + if err := c.Start(); err != nil { t.Fatal(err) } diff --git a/components/engine/integration-cli/utils.go b/components/engine/integration-cli/utils.go index 05c27dc5ac..37ce221b9b 100644 --- a/components/engine/integration-cli/utils.go +++ b/components/engine/integration-cli/utils.go @@ -95,13 +95,6 @@ func runCommand(cmd *exec.Cmd) (exitCode int, err error) { return } -func startCommand(cmd *exec.Cmd) (exitCode int, err error) { - exitCode = 0 - err = cmd.Start() - exitCode = processExitCode(err) - return -} - func logDone(message string) { fmt.Printf("[PASSED]: %s\n", message) } From 2a07b18ca11cd77a9d116bfef5f1e99fb34a5aad Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 17:47:28 -0800 Subject: [PATCH 3/6] Remove unnecessary abstraction nLines Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 02a021119fb2b3e051b98817831a8c1a8a9fd464 Component: engine --- components/engine/integration-cli/docker_cli_rmi_test.go | 8 ++++---- components/engine/integration-cli/utils.go | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_rmi_test.go b/components/engine/integration-cli/docker_cli_rmi_test.go index 4600c481fd..63d9f92983 100644 --- a/components/engine/integration-cli/docker_cli_rmi_test.go +++ b/components/engine/integration-cli/docker_cli_rmi_test.go @@ -46,14 +46,14 @@ func TestRmiTag(t *testing.T) { dockerCmd(t, "tag", "busybox", "utest:5000/docker:tag3") { imagesAfter, _, _ := dockerCmd(t, "images", "-a") - if nLines(imagesAfter) != nLines(imagesBefore)+3 { + if strings.Count(imagesAfter, "\n") != strings.Count(imagesBefore, "\n")+3 { t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter) } } dockerCmd(t, "rmi", "utest/docker:tag2") { imagesAfter, _, _ := dockerCmd(t, "images", "-a") - if nLines(imagesAfter) != nLines(imagesBefore)+2 { + if strings.Count(imagesAfter, "\n") != strings.Count(imagesBefore, "\n")+2 { t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter) } @@ -61,7 +61,7 @@ func TestRmiTag(t *testing.T) { dockerCmd(t, "rmi", "utest:5000/docker:tag3") { imagesAfter, _, _ := dockerCmd(t, "images", "-a") - if nLines(imagesAfter) != nLines(imagesBefore)+1 { + if strings.Count(imagesAfter, "\n") != strings.Count(imagesBefore, "\n")+1 { t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter) } @@ -69,7 +69,7 @@ func TestRmiTag(t *testing.T) { dockerCmd(t, "rmi", "utest:tag1") { imagesAfter, _, _ := dockerCmd(t, "images", "-a") - if nLines(imagesAfter) != nLines(imagesBefore)+0 { + if strings.Count(imagesAfter, "\n") != strings.Count(imagesBefore, "\n")+0 { t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter) } diff --git a/components/engine/integration-cli/utils.go b/components/engine/integration-cli/utils.go index 37ce221b9b..3ff6d3c438 100644 --- a/components/engine/integration-cli/utils.go +++ b/components/engine/integration-cli/utils.go @@ -105,10 +105,6 @@ func stripTrailingCharacters(target string) string { return target } -func nLines(s string) int { - return strings.Count(s, "\n") -} - func unmarshalJSON(data []byte, result interface{}) error { err := json.Unmarshal(data, result) if err != nil { From 9442c6a19e54704d24f87b2d27799ddaf5e8998e Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 17:52:06 -0800 Subject: [PATCH 4/6] Remove unnessary abstraction deepEqual Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: fa753e67ae2bf573c9dfb1da1e1135c5ef5ef415 Component: engine --- components/engine/integration-cli/docker_cli_build_test.go | 3 ++- components/engine/integration-cli/docker_cli_links_test.go | 5 +++-- components/engine/integration-cli/utils.go | 4 ---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 1d287bd7dc..b76e1d4789 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -9,6 +9,7 @@ import ( "os/exec" "path" "path/filepath" + "reflect" "regexp" "strings" "syscall" @@ -1569,7 +1570,7 @@ func TestBuildWithVolumes(t *testing.T) { t.Fatal(err) } - equal := deepEqual(&expected, &result) + equal := reflect.DeepEqual(&result, &expected) if !equal { t.Fatalf("Volumes %s, expected %s", result, expected) diff --git a/components/engine/integration-cli/docker_cli_links_test.go b/components/engine/integration-cli/docker_cli_links_test.go index d412ef2a1a..50269245fe 100644 --- a/components/engine/integration-cli/docker_cli_links_test.go +++ b/components/engine/integration-cli/docker_cli_links_test.go @@ -4,6 +4,7 @@ import ( "io/ioutil" "os" "os/exec" + "reflect" "strings" "testing" "time" @@ -121,7 +122,7 @@ func TestLinksInspectLinksStarted(t *testing.T) { output := convertSliceOfStringsToMap(result) - equal := deepEqual(expected, output) + equal := reflect.DeepEqual(output, expected) if !equal { t.Fatalf("Links %s, expected %s", result, expected) @@ -150,7 +151,7 @@ func TestLinksInspectLinksStopped(t *testing.T) { output := convertSliceOfStringsToMap(result) - equal := deepEqual(expected, output) + equal := reflect.DeepEqual(output, expected) if !equal { t.Fatalf("Links %s, but expected %s", result, expected) diff --git a/components/engine/integration-cli/utils.go b/components/engine/integration-cli/utils.go index 3ff6d3c438..2de432549c 100644 --- a/components/engine/integration-cli/utils.go +++ b/components/engine/integration-cli/utils.go @@ -114,10 +114,6 @@ func unmarshalJSON(data []byte, result interface{}) error { return nil } -func deepEqual(expected interface{}, result interface{}) bool { - return reflect.DeepEqual(result, expected) -} - func convertSliceOfStringsToMap(input []string) map[string]struct{} { output := make(map[string]struct{}) for _, v := range input { From 61a90c5a2bc901fbe593f87e71340266e28c40db Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 18:45:51 -0800 Subject: [PATCH 5/6] Run 'go vet' on integration-cli. Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 4ee3a318a1f43f35a8c6ec8b6b73db5ea8824de9 Component: engine --- components/engine/integration-cli/docker_cli_cp_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_cli_cp_test.go b/components/engine/integration-cli/docker_cli_cp_test.go index a5432849dd..7002e1a34a 100644 --- a/components/engine/integration-cli/docker_cli_cp_test.go +++ b/components/engine/integration-cli/docker_cli_cp_test.go @@ -512,7 +512,7 @@ func TestCpToDot(t *testing.T) { } content, err := ioutil.ReadFile("./test") if string(content) != "lololol\n" { - t.Fatal("Wrong content in copied file %q, should be %q", content, "lololol\n") + t.Fatalf("Wrong content in copied file %q, should be %q", content, "lololol\n") } logDone("cp - to dot path") } From de88b2cc7b41bc714cf381ca890a42240529dd71 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 3 Dec 2014 19:02:51 -0800 Subject: [PATCH 6/6] Fix output format where no variable specified in mount pkg Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 6fd818f3ef8ca018b74544362c37d41a1095ba9d Component: engine --- components/engine/pkg/mount/sharedsubtree_linux_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/pkg/mount/sharedsubtree_linux_test.go b/components/engine/pkg/mount/sharedsubtree_linux_test.go index 145d57bbd8..0986bd9c75 100644 --- a/components/engine/pkg/mount/sharedsubtree_linux_test.go +++ b/components/engine/pkg/mount/sharedsubtree_linux_test.go @@ -312,7 +312,7 @@ func TestSubtreeUnbindable(t *testing.T) { if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil && err != syscall.EINVAL { t.Fatal(err) } else if err == nil { - t.Fatalf("%q should not have been bindable") + t.Fatalf("%q should not have been bindable", sourceDir) } defer func() { if err := Unmount(targetDir); err != nil {