github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Update name, watch event occurence checking

Browse Source
This commit is contained in:
Caleb Woodbine 2020-05-25 11:49:57 +12:00
parent 32e0da39fc
commit b63b147d12
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1286,12 +1286,7 @@ func taintExists(taints []v1.Taint, taintToFind *v1.Taint) bool {
return false return false
} }
func getDynamicResourceWatch(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, listOptions metav1.ListOptions) (watch.Interface, error) { // WatchEventSequenceVerifier
res, err := dc.Resource(resourceType).Namespace(namespace).Watch(context.TODO(), listOptions)
return res, err
}
// WatchEventEnsurerAndManager
// manages a watch for a given resource, ensures that events take place in a given order, retries the test on failure // manages a watch for a given resource, ensures that events take place in a given order, retries the test on failure
// testContext cancelation signal across API boundries, e.g: context.TODO() // testContext cancelation signal across API boundries, e.g: context.TODO()
// dc sets up a client to the API // dc sets up a client to the API
@ -1301,39 +1296,45 @@ func getDynamicResourceWatch(testContext context.Context, dc dynamic.Interface,
// listOptions options used to find the resource, recommended to use listOptions.labelSelector // listOptions options used to find the resource, recommended to use listOptions.labelSelector
// expectedWatchEvents array of events which are expected to occur // expectedWatchEvents array of events which are expected to occur
// scenario the function to run // scenario the function to run
func WatchEventEnsurerAndManager(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions, expectedWatchEvents []watch.Event, scenario func(*watch.Interface) []watch.Event) { func WatchEventSequenceVerifier(testContext context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions, expectedWatchEvents []watch.Event, scenario func(*watchtools.RetryWatcher) []watch.Event) {
listWatcher := &cache.ListWatch{ listWatcher := &cache.ListWatch{
WatchFunc: func(listOptions metav1.ListOptions) (watch.Interface, error) { WatchFunc: func(listOptions metav1.ListOptions) (watch.Interface, error) {
return getDynamicResourceWatch(testContext, dc, resourceType, namespace, listOptions) return dc.Resource(resourceType).Namespace(namespace).Watch(testContext, listOptions)
}, },
} }
resourceWatch, err := watchtools.NewRetryWatcher("", listWatcher) resourceWatch, err := watchtools.NewRetryWatcher("", listWatcher)
ExpectNoError(err, "Failed to create a resource watch of %v in namespace %v", resourceType.Resource, namespace) ExpectNoError(err, "Failed to create a resource watch of %v in namespace %v", resourceType.Resource, namespace)
ExpectNoError(err, "Failed to create a watch for %v", resourceType.Resource) // NOTE value of 3 retries seems to make sense
retries := 3 retries := 3
retriesLoop: retriesLoop:
for try := 1; try <= retries; try++ { for try := 1; try <= retries; try++ {
// TODO pass resourceWatch to the test function, or just collect events separately and parse them after // NOTE the test may need access to the events to see what's going on, such as a change in status
scenario() actualWatchEvents := scenario(resourceWatch)
errs := sets.NewString() errs := sets.NewString()
watchEventsLoop: watchEventsLoop:
for watchEventIndex, _ := range expectedWatchEvents { for watchEventIndex, _ := range expectedWatchEvents {
foundExpectedWatchEvent := false
watchEventNextIndex := watchEventIndex + 1 watchEventNextIndex := watchEventIndex + 1
if watchEventNextIndex >= len(expectedWatchEvents) { if watchEventNextIndex >= len(expectedWatchEvents) {
continue watchEventsLoop continue watchEventsLoop
} }
// TODO validate watchEvent.Type, not Object for actualWatchEventIndex, _ := range actualWatchEvents {
for _, fn := range fns { if actualWatchEvents[watchEventIndex] == expectedWatchEvents[actualWatchEventIndex] {
if err := fn(expectedWatchEvents[watchEventIndex].Object, expectedWatchEvents[watchEventNextIndex].Object); err != nil { foundExpectedWatchEvent = true
errs.Insert(err.Error())
} }
} }
if foundExpectedWatchEvent == false {
errs.Insert(fmt.Sprintf("Watch event %v not found", expectedWatchEvents[watchEventIndex]))
} }
}
// 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* "))
// TODO delete resources via DynamicClient (on failure)
continue retriesLoop continue retriesLoop
} }
ExpectEqual(errs.Len() > 0, false, fmt.Errorf("invariants violated:\n* %s", strings.Join(errs.List(), "\n* "))) ExpectEqual(errs.Len() > 0, false, fmt.Errorf("invariants violated:\n* %s", strings.Join(errs.List(), "\n* ")))
// TODO delete resources via DynamicClient (on failure)
} }
} }