From 80ff4b90a519e9e5e625d810f505c51e3a421f76 Mon Sep 17 00:00:00 2001 From: zhucan Date: Tue, 14 Mar 2023 19:49:55 +0800 Subject: [PATCH] e2e: test for node expand volume with secrets failed Signed-off-by: zhucan --- test/e2e/storage/csi_mock/base.go | 4 ++-- test/e2e/storage/csi_mock/csi_volume_expansion.go | 5 ++--- test/e2e/storage/drivers/csi.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/e2e/storage/csi_mock/base.go b/test/e2e/storage/csi_mock/base.go index c822509ed29..4dc451d6e84 100644 --- a/test/e2e/storage/csi_mock/base.go +++ b/test/e2e/storage/csi_mock/base.go @@ -836,8 +836,8 @@ func compareCSICalls(ctx context.Context, trackedCalls []string, expectedCallSeq // if the secret is not nil, compare it if expectedCall.expectedSecret != nil { - if !reflect.DeepEqual(expectedCall.expectedSecret, c.Request.Secret) { - return allCalls, i, fmt.Errorf("Unexpected secret: expected %v, got %v", expectedCall.expectedSecret, c.Request.Secret) + if !reflect.DeepEqual(expectedCall.expectedSecret, c.Request.Secrets) { + return allCalls, i, fmt.Errorf("Unexpected secret: expected %v, got %v", expectedCall.expectedSecret, c.Request.Secrets) } } diff --git a/test/e2e/storage/csi_mock/csi_volume_expansion.go b/test/e2e/storage/csi_mock/csi_volume_expansion.go index 4fd0b79ce86..cbc840f098d 100644 --- a/test/e2e/storage/csi_mock/csi_volume_expansion.go +++ b/test/e2e/storage/csi_mock/csi_volume_expansion.go @@ -311,10 +311,9 @@ var _ = utils.SIGDescribe("CSI Mock volume expansion", func() { framework.ExpectNoError(err, "while waiting for PVC to finish") ginkgo.By("Waiting for all remaining expected CSI calls") - var allCalls []drivers.MockCSICall err = wait.Poll(time.Second, csiResizeWaitPeriod, func() (done bool, err error) { var index int - allCalls, index, err = compareCSICalls(ctx, trackedCalls, test.expectedCalls, m.driver.GetCalls) + _, index, err = compareCSICalls(ctx, trackedCalls, test.expectedCalls, m.driver.GetCalls) if err != nil { return true, err } @@ -328,7 +327,7 @@ var _ = utils.SIGDescribe("CSI Mock volume expansion", func() { } return false, nil }) - framework.ExpectNoError(err, fmt.Sprintf("while waiting for all CSI calls: %s", allCalls)) + framework.ExpectNoError(err, "while waiting for all CSI calls") pvcConditions := pvc.Status.Conditions framework.ExpectEqual(len(pvcConditions), 0, "pvc should not have conditions") diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index b41c485e843..09548a1c2f4 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -379,7 +379,7 @@ type MockCSICall struct { Method string Request struct { VolumeContext map[string]string `json:"volume_context"` - Secret map[string]string `json:"secret"` + Secrets map[string]string `json:"secrets"` } FullError struct { Code codes.Code `json:"code"`