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

Fix verify

Browse Source
This commit is contained in:
Caleb Woodbine 2020-06-04 08:57:28 +12:00
parent 8945d98805
commit 63c694acdf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1296,7 +1296,7 @@ func taintExists(taints []v1.Taint, taintToFind *v1.Taint) bool {
// 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 test itself // scenario the test itself
// retryCleanup a function to run which ensures that there are no dangling resources upon test failure // retryCleanup a function to run which ensures that there are no dangling resources upon test failure
func WatchEventSequenceVerifier(ctx context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions, expectedWatchEvents []watch.Event, scenario func(*watchtools.RetryWatcher) []watch.Event, retryCleanup func() error) { func WatchEventSequenceVerifier(ctx context.Context, dc dynamic.Interface, resourceType schema.GroupVersionResource, namespace string, resourceName string, listOptions metav1.ListOptions, expectedWatchEvents []watch.Event, scenario func(*watchtools.RetryWatcher) []watch.Event, retryCleanup func() error) {
initResource, err := dc.Resource(resourceType).Namespace(namespace).List(ctx, listOptions) initResource, err := dc.Resource(resourceType).Namespace(namespace).List(ctx, listOptions)
ExpectNoError(err, "Failed to fetch initial resource") ExpectNoError(err, "Failed to fetch initial resource")
@ -1335,7 +1335,7 @@ retriesLoop:
totalValidWatchEvents++ totalValidWatchEvents++
} }
err := retryCleanup() err := retryCleanup()
ExpectNoError(err, "Error occured when cleaning up resources") ExpectNoError(err, "Error occurred when cleaning up resources")
if errs.Len() > 0 && try < retries { if errs.Len() > 0 && try < retries {
fmt.Println("invariants violated:\n", strings.Join(errs.List(), "\n - ")) fmt.Println("invariants violated:\n", strings.Join(errs.List(), "\n - "))
continue retriesLoop continue retriesLoop