Merge pull request #2966 from andrewsmedina/govet2
fixed some `go vet` issues.
This commit is contained in:
commit
5f55c1aee1
|
@ -247,7 +247,7 @@ func TestChangesDirsMutated(t *testing.T) {
|
||||||
}
|
}
|
||||||
if changes[i].Path == expectedChanges[i].Path {
|
if changes[i].Path == expectedChanges[i].Path {
|
||||||
if changes[i] != expectedChanges[i] {
|
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 {
|
} else if changes[i].Path < expectedChanges[i].Path {
|
||||||
t.Fatalf("unexpected change %s\n", changes[i].String())
|
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
|
t.Skip("Skipping TestApplyLayer due to known failures") // Disable this for now as it is broken
|
||||||
return
|
return
|
||||||
|
|
||||||
src, err := ioutil.TempDir("", "docker-changes-test")
|
// src, err := ioutil.TempDir("", "docker-changes-test")
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
createSampleDir(t, src)
|
// createSampleDir(t, src)
|
||||||
dst := src + "-copy"
|
// dst := src + "-copy"
|
||||||
if err := copyDir(src, dst); err != nil {
|
// if err := copyDir(src, dst); err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
mutateSampleDir(t, dst)
|
// mutateSampleDir(t, dst)
|
||||||
|
|
||||||
changes, err := ChangesDirs(dst, src)
|
// changes, err := ChangesDirs(dst, src)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
layer, err := ExportChanges(dst, changes)
|
// layer, err := ExportChanges(dst, changes)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
layerCopy, err := NewTempArchive(layer, "")
|
// layerCopy, err := NewTempArchive(layer, "")
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
if err := ApplyLayer(src, layerCopy); err != nil {
|
// if err := ApplyLayer(src, layerCopy); err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
changes2, err := ChangesDirs(src, dst)
|
// changes2, err := ChangesDirs(src, dst)
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
t.Fatal(err)
|
// t.Fatal(err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
if len(changes2) != 0 {
|
// if len(changes2) != 0 {
|
||||||
t.Fatalf("Unexpected differences after re applying mutation: %v", changes)
|
// t.Fatalf("Unexpected differences after re applying mutation: %v", changes)
|
||||||
}
|
// }
|
||||||
|
|
||||||
os.RemoveAll(src)
|
// os.RemoveAll(src)
|
||||||
os.RemoveAll(dst)
|
// os.RemoveAll(dst)
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,16 +37,16 @@ func TestSetenvBool(t *testing.T) {
|
||||||
job := mkJob(t, "dummy")
|
job := mkJob(t, "dummy")
|
||||||
job.SetenvBool("foo", true)
|
job.SetenvBool("foo", true)
|
||||||
if val := job.GetenvBool("foo"); !val {
|
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)
|
job.SetenvBool("bar", false)
|
||||||
if val := job.GetenvBool("bar"); val {
|
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 {
|
if val := job.GetenvBool("nonexistent"); val {
|
||||||
t.Fatalf("GetenvBool returns incorrect value: %b", val)
|
t.Fatalf("GetenvBool returns incorrect value: %t", val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ package devmapper
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/dotcloud/docker/utils"
|
"github.com/dotcloud/docker/utils"
|
||||||
"io"
|
"io"
|
||||||
|
@ -174,7 +175,7 @@ func (devices *DeviceSet) saveMetadata() error {
|
||||||
return fmt.Errorf("Error closing metadata file %s: %s", tmpFile.Name(), err)
|
return fmt.Errorf("Error closing metadata file %s: %s", tmpFile.Name(), err)
|
||||||
}
|
}
|
||||||
if err := osRename(tmpFile.Name(), devices.jsonFile()); err != nil {
|
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 {
|
if devices.NewTransactionId != devices.TransactionId {
|
||||||
|
@ -441,11 +442,11 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error {
|
||||||
hasMetadata := devices.hasImage("metadata")
|
hasMetadata := devices.hasImage("metadata")
|
||||||
|
|
||||||
if !doInit && !hasData {
|
if !doInit && !hasData {
|
||||||
return fmt.Errorf("Looback data file not found %s")
|
return errors.New("Loopback data file not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
if !doInit && !hasMetadata {
|
if !doInit && !hasMetadata {
|
||||||
return fmt.Errorf("Looback metadata file not found %s")
|
return errors.New("Loopback metadata file not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
createdLoopback := !hasData || !hasMetadata
|
createdLoopback := !hasData || !hasMetadata
|
||||||
|
|
|
@ -127,7 +127,7 @@ func setupBaseImage() {
|
||||||
job.SetenvBool("Autorestart", false)
|
job.SetenvBool("Autorestart", false)
|
||||||
job.Setenv("BridgeIface", unitTestNetworkBridge)
|
job.Setenv("BridgeIface", unitTestNetworkBridge)
|
||||||
if err := job.Run(); err != nil {
|
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))
|
srv := mkServerFromEngine(eng, log.New(os.Stderr, "", 0))
|
||||||
|
|
||||||
|
@ -173,7 +173,7 @@ func spawnGlobalDaemon() {
|
||||||
func GetTestImage(runtime *docker.Runtime) *docker.Image {
|
func GetTestImage(runtime *docker.Runtime) *docker.Image {
|
||||||
imgs, err := runtime.Graph().Map()
|
imgs, err := runtime.Graph().Map()
|
||||||
if err != nil {
|
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 {
|
for _, image := range imgs {
|
||||||
if image.ID == unitTestImageID {
|
if image.ID == unitTestImageID {
|
||||||
|
|
|
@ -590,7 +590,7 @@ type Nat struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *Nat) String() string {
|
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
|
// Release: Network cleanup - release all resources
|
||||||
|
|
|
@ -397,8 +397,8 @@ func (srv *Server) recursiveLoad(address, tmpImageDir string) error {
|
||||||
|
|
||||||
imageJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", address, "json"))
|
imageJson, err := ioutil.ReadFile(path.Join(tmpImageDir, "repo", address, "json"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
|
||||||
utils.Debugf("Error reading json", err)
|
utils.Debugf("Error reading json", err)
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
layer, err := os.Open(path.Join(tmpImageDir, "repo", address, "layer.tar"))
|
layer, err := os.Open(path.Join(tmpImageDir, "repo", address, "layer.tar"))
|
||||||
|
|
Loading…
Reference in New Issue