github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6682 from thockin/spew-keys-in-hash 

Make DeepHashObject use SpewKeys
pull/6/head
Dawn Chen 2015-04-10 09:58:47 -07:00
parent 1db1894850 c989f30a00
commit c7ca118c7a
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/util/hash.go
View File

@ -27,6 +27,11 @@ import (
// ensuring the hash does not change when a pointer changes.
func DeepHashObject(hasher hash.Hash, objectToWrite interface{}) {
hasher.Reset()
printer := spew.ConfigState{Indent: " ", SortKeys: true}
printer := spew.ConfigState{
Indent: " ",
SortKeys: true,
DisableMethods: true,
SpewKeys: true,
}
printer.Fprintf(hasher, "%#v", objectToWrite)
}

29
pkg/util/hash_test.go
View File

@ -44,31 +44,6 @@ func (c C) String() string {
}
func TestDeepHashObject(t *testing.T) {
// These types are known to fail object hashing because of how spew implements map keys.
// http://github.com/davecgh/go-spew/issues/30
failureCases := []func() interface{}{
func() interface{} { return map[A]bool{A{8675309, "Jenny"}: true, A{9765683, "!Jenny"}: false} },
func() interface{} { return map[C]bool{C{8675309, "Jenny"}: true, C{9765683, "!Jenny"}: false} },
func() interface{} { return map[*A]bool{&A{8675309, "Jenny"}: true, &A{9765683, "!Jenny"}: false} },
func() interface{} { return map[*C]bool{&C{8675309, "Jenny"}: true, &C{9765683, "!Jenny"}: false} },
}
for _, tc := range failureCases {
hasher := adler32.New()
DeepHashObject(hasher, tc())
first := hasher.Sum32()
alwaysSame := false
for i := 0; i < 100; i++ {
DeepHashObject(hasher, tc())
if hasher.Sum32() != first {
alwaysSame = false
break
}
}
if alwaysSame {
t.Errorf("expected failure for %q", toString(tc()))
}
}
successCases := []func() interface{}{
func() interface{} { return 8675309 },
func() interface{} { return "Jenny, I got your number" },
@ -81,6 +56,10 @@ func TestDeepHashObject(t *testing.T) {
func() interface{} {
return B{[]int{8, 6, 7}, map[string]bool{"5": true, "3": true, "0": true, "9": true}}
},
func() interface{} { return map[A]bool{A{8675309, "Jenny"}: true, A{9765683, "!Jenny"}: false} },
func() interface{} { return map[C]bool{C{8675309, "Jenny"}: true, C{9765683, "!Jenny"}: false} },
func() interface{} { return map[*A]bool{&A{8675309, "Jenny"}: true, &A{9765683, "!Jenny"}: false} },
func() interface{} { return map[*C]bool{&C{8675309, "Jenny"}: true, &C{9765683, "!Jenny"}: false} },
}
for _, tc := range successCases {