From 2547db84e511eb71c0a78b7bb6d41aee9fc8d4b8 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Sun, 17 May 2015 17:49:04 +0500 Subject: [PATCH] test getHash() consistency --- docker/container.go | 31 ++++++++++--------------------- docker/container_test.go | 30 ++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/docker/container.go b/docker/container.go index 2636cb01..ae405a43 100644 --- a/docker/container.go +++ b/docker/container.go @@ -41,12 +41,11 @@ func (c ByCreated) Len() int { return len(c) } func (c ByCreated) Swap(i, j int) { c[i], c[j] = c[j], c[i] } func (c ByCreated) Less(i, j int) bool { return c[j].Created < c[i].Created } -func getHash(containerCfg *config.ContainerConfig) (string, error) { +func getHash(containerCfg *config.ContainerConfig) string { hash := sha1.New() - w := util.NewErrorWriter(hash) - w.Write([]byte(containerCfg.Id)) - w.Write([]byte(containerCfg.Cmd)) + hash.Write([]byte(containerCfg.Id)) + hash.Write([]byte(containerCfg.Cmd)) if containerCfg.Service != nil { //Get values of Service through reflection val := reflect.ValueOf(containerCfg.Service).Elem() @@ -76,7 +75,7 @@ func getHash(containerCfg *config.ContainerConfig) (string, error) { switch s := serviceValue.(type) { default: - w.Write([]byte(fmt.Sprintf("%v", serviceValue))) + hash.Write([]byte(fmt.Sprintf("%v", serviceValue))) case *project.SliceorMap: for lkey := range s.MapParts() { if lkey != "io.rancher.os.hash" { @@ -86,31 +85,27 @@ func getHash(containerCfg *config.ContainerConfig) (string, error) { sort.Strings(sliceKeys) for j := 0; j < len(sliceKeys); j++ { - w.Write([]byte(fmt.Sprintf("%s=%v", sliceKeys[j], s.MapParts()[sliceKeys[j]]))) + hash.Write([]byte(fmt.Sprintf("%s=%v", sliceKeys[j], s.MapParts()[sliceKeys[j]]))) } case *project.Stringorslice: sliceKeys = s.Slice() sort.Strings(sliceKeys) for j := 0; j < len(sliceKeys); j++ { - w.Write([]byte(fmt.Sprintf("%s", sliceKeys[j]))) + hash.Write([]byte(fmt.Sprintf("%s", sliceKeys[j]))) } case []string: sliceKeys = s sort.Strings(sliceKeys) for j := 0; j < len(sliceKeys); j++ { - w.Write([]byte(fmt.Sprintf("%s", sliceKeys[j]))) + hash.Write([]byte(fmt.Sprintf("%s", sliceKeys[j]))) } } } } - if w.Err != nil { - return "", w.Err - } - - return hex.EncodeToString(hash.Sum([]byte{})), nil + return hex.EncodeToString(hash.Sum([]byte{})) } func StartAndWait(dockerHost string, containerCfg *config.ContainerConfig) error { @@ -171,10 +166,7 @@ func (c *Container) Lookup() *Container { return c } - hash, err := getHash(c.ContainerCfg) - if err != nil { - return c.returnErr(err) - } + hash := getHash(c.ContainerCfg) client, err := NewClient(c.dockerHost) if err != nil { @@ -486,10 +478,7 @@ func (c *Container) getCreateOpts(client *dockerClient.Client) (*dockerClient.Cr opts.Config.Labels = make(map[string]string) } - hash, err := getHash(c.ContainerCfg) - if err != nil { - return nil, err - } + hash := getHash(c.ContainerCfg) opts.Config.Labels[config.HASH] = hash opts.Config.Labels[config.ID] = c.ContainerCfg.Id diff --git a/docker/container_test.go b/docker/container_test.go index c75705be..313115ad 100644 --- a/docker/container_test.go +++ b/docker/container_test.go @@ -5,31 +5,30 @@ import ( "testing" "github.com/rancherio/os/config" + "github.com/rancherio/rancher-compose/librcompose/project" "github.com/stretchr/testify/require" dockerClient "github.com/fsouza/go-dockerclient" + "github.com/Sirupsen/logrus" ) func TestHash(t *testing.T) { assert := require.New(t) - hash, err := getHash(&config.ContainerConfig{ + hash := getHash(&config.ContainerConfig{ Id: "id", Cmd: "1 2 3", }) - assert.NoError(err, "") - hash2, err := getHash(&config.ContainerConfig{ + hash2 := getHash(&config.ContainerConfig{ Id: "id2", Cmd: "1 2 3", }) - assert.NoError(err, "") - hash3, err := getHash(&config.ContainerConfig{ + hash3 := getHash(&config.ContainerConfig{ Id: "id3", Cmd: "1 2 3 4", }) - assert.NoError(err, "") assert.Equal("510b68938cba936876588b0143093a5850d4a142", hash, "") assert.NotEqual(hash, hash2, "") @@ -37,6 +36,25 @@ func TestHash(t *testing.T) { assert.NotEqual(hash, hash3, "") } +func TestHash2(t *testing.T) { + assert := require.New(t) + + cfg := &config.ContainerConfig{ + Id: "docker-volumes", + Cmd: "", + MigrateVolumes: false, + ReloadConfig: false, + CreateOnly: true, + Service: &project.ServiceConfig{CapAdd:[]string(nil), CapDrop:[]string(nil), CpuShares:0, Command:"", Detach:"", Dns:project.NewStringorslice(), DnsSearch:project.NewStringorslice(), DomainName:"", Entrypoint:"", EnvFile:"", Environment:project.NewMaporslice([]string{}), Hostname:"", Image:"state", Labels:project.NewSliceorMap(map[string]string{"io.rancher.os.createonly":"true", "io.rancher.os.scope":"system"}), Links:[]string(nil), LogDriver:"json-file", MemLimit:0, Name:"", Net:"none", Pid:"", Ipc:"", Ports:[]string(nil), Privileged:true, Restart:"", ReadOnly:true, StdinOpen:false, Tty:false, User:"", Volumes:[]string{"/var/lib/docker:/var/lib/docker", "/var/lib/rancher/conf:/var/lib/rancher/conf", "/var/lib/system-docker:/var/lib/system-docker"}, VolumesFrom:[]string(nil), WorkingDir:"", Expose:[]string(nil), ExternalLinks:[]string(nil)}, + } + + for i := 0; i < 10000; i++ { + logrus.Infoln(i) + assert.Equal(getHash(cfg), getHash(cfg), "") + } +} + + func TestParse(t *testing.T) { assert := require.New(t)