From 9b300defa331d3d0e9c33069b0161d08d550745f Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Tue, 19 Jul 2022 15:34:23 +0800 Subject: [PATCH] make TestListPager_EachListItem rework Signed-off-by: Abirdcfly Kubernetes-commit: 5e84f6b6d7cd39b785eaca404c3f7e460f80f71b --- tools/pager/pager_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/pager/pager_test.go b/tools/pager/pager_test.go index 2b63e55f..6137e26c 100644 --- a/tools/pager/pager_test.go +++ b/tools/pager/pager_test.go @@ -301,16 +301,10 @@ func TestListPager_EachListItem(t *testing.T) { { name: "cancel context while processing", fields: fields{PageSize: 10, PageFn: (&testPager{t: t, expectPage: 10, remaining: 51, rv: "rv:20"}).PagedList}, - want: list(3, "rv:20"), // all the items <= the one the processor returned an error on should have been visited + want: list(10, "rv:20"), // The whole PageSize worth of items got returned. wantErr: true, cancelContextOnItem: 3, }, - { - name: "panic processing item", - fields: fields{PageSize: 10, PageFn: (&testPager{t: t, expectPage: 10, remaining: 51, rv: "rv:20"}).PagedList}, - want: list(3, "rv:20"), // all the items <= the one the processor returned an error on should have been visited - wantPanic: true, - }, } processorErr := fmt.Errorf("processor error") @@ -345,8 +339,7 @@ func TestListPager_EachListItem(t *testing.T) { err = p.EachListItem(ctx, metav1.ListOptions{}, fn) }() if (panic != nil) && !tt.wantPanic { - t.Fatalf(".EachListItem() panic = %v, wantPanic %v", panic, tt.wantPanic) - } else { + t.Errorf(".EachListItem() panic = %v, wantPanic %v", panic, tt.wantPanic) return } if (err != nil) != tt.wantErr {