From a6c9a332d040a98c5cf4325491fc8d9aa7e5475b Mon Sep 17 00:00:00 2001 From: Andrews Medina Date: Fri, 29 Nov 2013 22:53:20 -0200 Subject: [PATCH 1/3] fixed some `go vet` issues. --- archive/changes_test.go | 70 +++++++++++++++--------------- engine/env_test.go | 6 +-- graphdriver/devmapper/deviceset.go | 6 +-- integration/runtime_test.go | 4 +- network.go | 2 +- server.go | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/archive/changes_test.go b/archive/changes_test.go index a840c691ff..714ab71e2d 100644 --- a/archive/changes_test.go +++ b/archive/changes_test.go @@ -247,7 +247,7 @@ func TestChangesDirsMutated(t *testing.T) { } if changes[i].Path == expectedChanges[i].Path { if changes[i] != expectedChanges[i] { - t.Fatalf("Wrong change for %s, expected %s, got %d\n", changes[i].Path, changes[i].String(), expectedChanges[i].String()) + t.Fatalf("Wrong change for %s, expected %s, got %s\n", changes[i].Path, changes[i].String(), expectedChanges[i].String()) } } else if changes[i].Path < expectedChanges[i].Path { t.Fatalf("unexpected change %s\n", changes[i].String()) @@ -261,45 +261,45 @@ func TestApplyLayer(t *testing.T) { t.Skip("Skipping TestApplyLayer due to known failures") // Disable this for now as it is broken return - src, err := ioutil.TempDir("", "docker-changes-test") - if err != nil { - t.Fatal(err) - } - createSampleDir(t, src) - dst := src + "-copy" - if err := copyDir(src, dst); err != nil { - t.Fatal(err) - } - mutateSampleDir(t, dst) + // src, err := ioutil.TempDir("", "docker-changes-test") + // if err != nil { + // t.Fatal(err) + // } + // createSampleDir(t, src) + // dst := src + "-copy" + // if err := copyDir(src, dst); err != nil { + // t.Fatal(err) + // } + // mutateSampleDir(t, dst) - changes, err := ChangesDirs(dst, src) - if err != nil { - t.Fatal(err) - } + // changes, err := ChangesDirs(dst, src) + // if err != nil { + // t.Fatal(err) + // } - layer, err := ExportChanges(dst, changes) - if err != nil { - t.Fatal(err) - } + // layer, err := ExportChanges(dst, changes) + // if err != nil { + // t.Fatal(err) + // } - layerCopy, err := NewTempArchive(layer, "") - if err != nil { - t.Fatal(err) - } + // layerCopy, err := NewTempArchive(layer, "") + // if err != nil { + // t.Fatal(err) + // } - if err := ApplyLayer(src, layerCopy); err != nil { - t.Fatal(err) - } + // if err := ApplyLayer(src, layerCopy); err != nil { + // t.Fatal(err) + // } - changes2, err := ChangesDirs(src, dst) - if err != nil { - t.Fatal(err) - } + // changes2, err := ChangesDirs(src, dst) + // if err != nil { + // t.Fatal(err) + // } - if len(changes2) != 0 { - t.Fatalf("Unexpected differences after re applying mutation: %v", changes) - } + // if len(changes2) != 0 { + // t.Fatalf("Unexpected differences after re applying mutation: %v", changes) + // } - os.RemoveAll(src) - os.RemoveAll(dst) + // os.RemoveAll(src) + // os.RemoveAll(dst) } diff --git a/engine/env_test.go b/engine/env_test.go index 343da31cec..24c5992dd0 100644 --- a/engine/env_test.go +++ b/engine/env_test.go @@ -37,16 +37,16 @@ func TestSetenvBool(t *testing.T) { job := mkJob(t, "dummy") job.SetenvBool("foo", true) if val := job.GetenvBool("foo"); !val { - t.Fatalf("GetenvBool returns incorrect value: %b", val) + t.Fatalf("GetenvBool returns incorrect value: %t", val) } job.SetenvBool("bar", false) if val := job.GetenvBool("bar"); val { - t.Fatalf("GetenvBool returns incorrect value: %b", val) + t.Fatalf("GetenvBool returns incorrect value: %t", val) } if val := job.GetenvBool("nonexistent"); val { - t.Fatalf("GetenvBool returns incorrect value: %b", val) + t.Fatalf("GetenvBool returns incorrect value: %t", val) } } diff --git a/graphdriver/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go index 77d865ad99..a65c02f87e 100644 --- a/graphdriver/devmapper/deviceset.go +++ b/graphdriver/devmapper/deviceset.go @@ -172,7 +172,7 @@ func (devices *DeviceSet) saveMetadata() error { return fmt.Errorf("Error closing metadata file %s: %s", tmpFile.Name(), err) } if err := osRename(tmpFile.Name(), devices.jsonFile()); err != nil { - return fmt.Errorf("Error committing metadata file", err) + return fmt.Errorf("Error committing metadata file %s: %s", tmpFile.Name(), err) } if devices.NewTransactionId != devices.TransactionId { @@ -439,11 +439,11 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error { hasMetadata := devices.hasImage("metadata") if !doInit && !hasData { - return fmt.Errorf("Looback data file not found %s") + return fmt.Error("Looback data file not found") } if !doInit && !hasMetadata { - return fmt.Errorf("Looback metadata file not found %s") + return fmt.Error("Looback metadata file not found") } createdLoopback := !hasData || !hasMetadata diff --git a/integration/runtime_test.go b/integration/runtime_test.go index 1ab6d0a080..fda8a03829 100644 --- a/integration/runtime_test.go +++ b/integration/runtime_test.go @@ -127,7 +127,7 @@ func setupBaseImage() { job.SetenvBool("Autorestart", false) job.Setenv("BridgeIface", unitTestNetworkBridge) if err := job.Run(); err != nil { - log.Fatalf("Unable to create a runtime for tests:", err) + log.Fatalf("Unable to create a runtime for tests: %s", err) } srv := mkServerFromEngine(eng, log.New(os.Stderr, "", 0)) @@ -173,7 +173,7 @@ func spawnGlobalDaemon() { func GetTestImage(runtime *docker.Runtime) *docker.Image { imgs, err := runtime.Graph().Map() if err != nil { - log.Fatalf("Unable to get the test image:", err) + log.Fatalf("Unable to get the test image: %s", err) } for _, image := range imgs { if image.ID == unitTestImageID { diff --git a/network.go b/network.go index 1397de0557..dd23dd48c1 100644 --- a/network.go +++ b/network.go @@ -580,7 +580,7 @@ type Nat struct { } func (n *Nat) String() string { - return fmt.Sprintf("%s:%d:%d/%s", n.Binding.HostIp, n.Binding.HostPort, n.Port.Port(), n.Port.Proto()) + return fmt.Sprintf("%s:%s:%s/%s", n.Binding.HostIp, n.Binding.HostPort, n.Port.Port(), n.Port.Proto()) } // Release: Network cleanup - release all resources diff --git a/server.go b/server.go index 725b964a70..c1e6c7d87b 100644 --- a/server.go +++ b/server.go @@ -386,8 +386,8 @@ func (srv *Server) recursiveLoad(address, tmpImageDir string) error { imageJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", address, "json")) if err != nil { - return err utils.Debugf("Error reading json", err) + return err } layer, err := os.Open(path.Join(tmpImageDir, "repo", address, "layer.tar")) From e8437e8fcffae3661b9decdc1c576083c0de5219 Mon Sep 17 00:00:00 2001 From: Andrews Medina Date: Sat, 30 Nov 2013 01:02:09 -0200 Subject: [PATCH 2/3] using `errors.New` instead `fmt.Error`. --- graphdriver/devmapper/deviceset.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/graphdriver/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go index a65c02f87e..f2e99d9ed7 100644 --- a/graphdriver/devmapper/deviceset.go +++ b/graphdriver/devmapper/deviceset.go @@ -2,6 +2,7 @@ package devmapper import ( "encoding/json" + "errors" "fmt" "github.com/dotcloud/docker/utils" "io" @@ -439,11 +440,11 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error { hasMetadata := devices.hasImage("metadata") if !doInit && !hasData { - return fmt.Error("Looback data file not found") + return errors.New("Looback data file not found") } if !doInit && !hasMetadata { - return fmt.Error("Looback metadata file not found") + return errors.New("Looback metadata file not found") } createdLoopback := !hasData || !hasMetadata From fea432bdf542a469ae9b5b114b6858a7bc56b323 Mon Sep 17 00:00:00 2001 From: Andrews Medina Date: Sat, 30 Nov 2013 16:28:52 -0200 Subject: [PATCH 3/3] fixed `Looback` typo. --- graphdriver/devmapper/deviceset.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphdriver/devmapper/deviceset.go b/graphdriver/devmapper/deviceset.go index f2e99d9ed7..a2a88040f5 100644 --- a/graphdriver/devmapper/deviceset.go +++ b/graphdriver/devmapper/deviceset.go @@ -440,11 +440,11 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error { hasMetadata := devices.hasImage("metadata") if !doInit && !hasData { - return errors.New("Looback data file not found") + return errors.New("Loopback data file not found") } if !doInit && !hasMetadata { - return errors.New("Looback metadata file not found") + return errors.New("Loopback metadata file not found") } createdLoopback := !hasData || !hasMetadata