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

Ensure events occur regardless of the events in between

Browse Source
This commit is contained in:
Caleb Woodbine 2020-06-10 10:51:39 +12:00
parent 39fd803140
commit 5268ba5488
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1317,22 +1317,26 @@ 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: ExpectEqual(len(expectedWatchEvents) <= len(actualWatchEvents), true, "Error: actual watch events amount (%d) must be greater than or equal to expected watch events amount (%d)", len(actualWatchEvents), len(expectedWatchEvents))
totalValidWatchEvents := 0 totalValidWatchEvents := 0
actualWatchEventsHasDelete := false foundEventIndexes := map[int]*int{}
for watchEventIndex := range expectedWatchEvents {
for watchEventIndex, expectedWatchEvent := range expectedWatchEvents {
foundExpectedWatchEvent := false foundExpectedWatchEvent := false
ExpectEqual(len(expectedWatchEvents) <= len(actualWatchEvents), true, "Error: actual watch events amount (%d) must be greater than or equal to expected watch events amount (%d)", len(actualWatchEvents), len(expectedWatchEvents)) actualWatchEventsLoop:
for actualWatchEventIndex := range actualWatchEvents { for actualWatchEventIndex, actualWatchEvent := range actualWatchEvents {
if actualWatchEvents[watchEventIndex].Type == expectedWatchEvents[actualWatchEventIndex].Type { if foundEventIndexes[actualWatchEventIndex] != nil {
foundExpectedWatchEvent = true continue actualWatchEventsLoop
} }
if actualWatchEvents[actualWatchEventIndex].Type == watch.Deleted && actualWatchEventsHasDelete != true { if actualWatchEvent.Type == expectedWatchEvent.Type {
actualWatchEventsHasDelete = true foundExpectedWatchEvent = true
foundEventIndexes[actualWatchEventIndex] = &watchEventIndex
break actualWatchEventsLoop
} }
} }
if foundExpectedWatchEvent == false { if foundExpectedWatchEvent == false {
errs.Insert(fmt.Sprintf("Watch event %v not found", expectedWatchEvents[watchEventIndex].Type)) errs.Insert(fmt.Sprintf("Watch event %v not found", expectedWatchEvent.Type))
} }
totalValidWatchEvents++ totalValidWatchEvents++
} }