Merge pull request kubernetes#125356 from p0lyn0mial/upstream-improve-testdrivechecklistfromcache-test

k8s-ci-robot · web-flow · commit 4e2a6201a43f · 2024-06-06T09:16:38.000-07:00
improve TestDriveCheckListFromCacheDataConsistencyIfRequested
diff --git a/staging/src/k8s.io/client-go/util/consistencydetector/list_data_consistency_detector_test.go b/staging/src/k8s.io/client-go/util/consistencydetector/list_data_consistency_detector_test.go
@@ -29,15 +29,15 @@ import (
 
 var (
 	emptyListFunc = func(_ context.Context, opts metav1.ListOptions) (*v1.PodList, error) {
-		return nil, nil
+		return &v1.PodList{}, nil
 	}
 	emptyListOptions = metav1.ListOptions{}
 )
 
 func TestDriveCheckListFromCacheDataConsistencyIfRequested(t *testing.T) {
 	ctx := context.TODO()
 
-	CheckListFromCacheDataConsistencyIfRequested(ctx, "", emptyListFunc, emptyListOptions, nil)
+	CheckListFromCacheDataConsistencyIfRequested(ctx, "", emptyListFunc, emptyListOptions, &v1.PodList{})
 }
 
 func TestCheckListFromCacheDataConsistencyIfRequestedInternalPanics(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ import (`
`29`	`29`
`30`	`30`	`var (`
`31`	`31`	`emptyListFunc = func(_ context.Context, opts metav1.ListOptions) (*v1.PodList, error) {`
`32`		`- return nil, nil`
	`32`	`+ return &v1.PodList{}, nil`
`33`	`33`	`}`
`34`	`34`	`emptyListOptions = metav1.ListOptions{}`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`func TestDriveCheckListFromCacheDataConsistencyIfRequested(t *testing.T) {`
`38`	`38`	`ctx := context.TODO()`
`39`	`39`
`40`		`- CheckListFromCacheDataConsistencyIfRequested(ctx, "", emptyListFunc, emptyListOptions, nil)`
	`40`	`+ CheckListFromCacheDataConsistencyIfRequested(ctx, "", emptyListFunc, emptyListOptions, &v1.PodList{})`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func TestCheckListFromCacheDataConsistencyIfRequestedInternalPanics(t *testing.T) {`