github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix checks, amount checking

Browse Source
This commit is contained in:
Caleb Woodbine 2020-05-25 13:33:48 +12:00
parent b63b147d12
commit 9f0c24ddcf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/framework/util.go
View File

@ -1312,22 +1312,22 @@ retriesLoop:
// NOTE the test may need access to the events to see what's going on, such as a change in status // NOTE the test may need access to the events to see what's going on, such as a change in status
actualWatchEvents := scenario(resourceWatch) actualWatchEvents := scenario(resourceWatch)
errs := sets.NewString() errs := sets.NewString()
watchEventsLoop: // watchEventsLoop:
totalValidWatchEvents := 0
for watchEventIndex, _ := range expectedWatchEvents { for watchEventIndex, _ := range expectedWatchEvents {
foundExpectedWatchEvent := false foundExpectedWatchEvent := false
watchEventNextIndex := watchEventIndex + 1 ExpectEqual(len(expectedWatchEvents) <= len(actualWatchEvents), true, "Error: actual watch events amount must be greater than or equal to expected watch events amount")
if watchEventNextIndex >= len(expectedWatchEvents) {
continue watchEventsLoop
}
for actualWatchEventIndex, _ := range actualWatchEvents { for actualWatchEventIndex, _ := range actualWatchEvents {
if actualWatchEvents[watchEventIndex] == expectedWatchEvents[actualWatchEventIndex] { if actualWatchEvents[watchEventIndex].Type == expectedWatchEvents[actualWatchEventIndex].Type {
foundExpectedWatchEvent = true foundExpectedWatchEvent = true
} }
} }
if foundExpectedWatchEvent == false { if foundExpectedWatchEvent == false {
errs.Insert(fmt.Sprintf("Watch event %v not found", expectedWatchEvents[watchEventIndex])) errs.Insert(fmt.Sprintf("Watch event %v not found", expectedWatchEvents[watchEventIndex].Type))
} }
totalValidWatchEvents ++
} }
ExpectEqual(totalValidWatchEvents, len(expectedWatchEvents), "Error: there must be an equal amount of total valid watch events (%v) and expected watch events (%v)", totalValidWatchEvents, len(expectedWatchEvents))
// TODO restructure failures handling // TODO restructure failures handling
if errs.Len() > 0 && try < retries { if errs.Len() > 0 && try < retries {
fmt.Errorf("invariants violated:\n* %s", strings.Join(errs.List(), "\n* ")) fmt.Errorf("invariants violated:\n* %s", strings.Join(errs.List(), "\n* "))