fix(tests): fix sorting hooks test flake

pull/2674/head
Adam Reese 8 years ago
parent 0a20ed73be
commit 9325d136d4
No known key found for this signature in database
GPG Key ID: 06F35E60A7A18DD6

@ -197,17 +197,18 @@ metadata:
sorted := []manifest{} sorted := []manifest{}
for _, s := range data { for _, s := range data {
manifests := util.SplitManifests(s.manifest) manifests := util.SplitManifests(s.manifest)
mCount := 0
for _, m := range manifests {
name := s.name[mCount]
for _, m := range manifests {
var sh util.SimpleHead var sh util.SimpleHead
err := yaml.Unmarshal([]byte(m), &sh) err := yaml.Unmarshal([]byte(m), &sh)
if err != nil { if err != nil {
// This is expected for manifests that are corrupt or empty. // This is expected for manifests that are corrupt or empty.
t.Log(err) t.Log(err)
continue
} }
name := sh.Metadata.Name
//only keep track of non-hook manifests //only keep track of non-hook manifests
if err == nil && s.hooks[name] == nil { if err == nil && s.hooks[name] == nil {
another := manifest{ another := manifest{
@ -217,8 +218,6 @@ metadata:
} }
sorted = append(sorted, another) sorted = append(sorted, another)
} }
mCount++
} }
} }

Loading…
Cancel
Save