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

Merge pull request #111751 from dobsonj/issue111740

Browse Source 
Fix flaky CSIInlineVolumes e2e test (issue 111740)
This commit is contained in:
Kubernetes Prow Robot 2022-08-08 19:54:49 -07:00 committed by GitHub
commit a837be03ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/e2e/storage/csi_inline.go
View File

@ -47,6 +47,9 @@ var _ = utils.SIGDescribe("CSIInlineVolumes", func() {
driver1 := &storagev1.CSIDriver{ driver1 := &storagev1.CSIDriver{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "inline-driver-" + string(uuid.NewUUID()), Name: "inline-driver-" + string(uuid.NewUUID()),
Labels: map[string]string{
"test": f.UniqueName,
},
}, },
Spec: storagev1.CSIDriverSpec{ Spec: storagev1.CSIDriverSpec{
@ -59,6 +62,9 @@ var _ = utils.SIGDescribe("CSIInlineVolumes", func() {
driver2 := &storagev1.CSIDriver{ driver2 := &storagev1.CSIDriver{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "inline-driver-" + string(uuid.NewUUID()), Name: "inline-driver-" + string(uuid.NewUUID()),
Labels: map[string]string{
"test": f.UniqueName,
},
}, },
Spec: storagev1.CSIDriverSpec{ Spec: storagev1.CSIDriverSpec{
@ -70,12 +76,6 @@ var _ = utils.SIGDescribe("CSIInlineVolumes", func() {
}, },
} }
ginkgo.By("listing existing drivers")
driverList, err := client.List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err)
numDriversBefore := len(driverList.Items)
numDriversAfter := numDriversBefore + 2
ginkgo.By("creating") ginkgo.By("creating")
createdDriver1, err := client.Create(context.TODO(), driver1, metav1.CreateOptions{}) createdDriver1, err := client.Create(context.TODO(), driver1, metav1.CreateOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -95,18 +95,26 @@ var _ = utils.SIGDescribe("CSIInlineVolumes", func() {
framework.ExpectEqual(retrievedDriver2.UID, createdDriver2.UID) framework.ExpectEqual(retrievedDriver2.UID, createdDriver2.UID)
ginkgo.By("listing") ginkgo.By("listing")
driverList, err = client.List(context.TODO(), metav1.ListOptions{}) driverList, err := client.List(context.TODO(), metav1.ListOptions{LabelSelector: "test=" + f.UniqueName})
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectEqual(len(driverList.Items), numDriversAfter, "list should have %d items, got: %s", numDriversAfter, driverList) framework.ExpectEqual(len(driverList.Items), 2, "filtered list should have 2 items, got: %s", driverList)
ginkgo.By("deleting") ginkgo.By("deleting")
err = client.Delete(context.TODO(), createdDriver1.Name, metav1.DeleteOptions{}) for _, driver := range driverList.Items {
framework.ExpectNoError(err) err := client.Delete(context.TODO(), driver.Name, metav1.DeleteOptions{})
err = client.Delete(context.TODO(), createdDriver2.Name, metav1.DeleteOptions{}) framework.ExpectNoError(err)
framework.ExpectNoError(err) retrievedDriver, err := client.Get(context.TODO(), driver.Name, metav1.GetOptions{})
driverList, err = client.List(context.TODO(), metav1.ListOptions{}) switch {
framework.ExpectNoError(err) case apierrors.IsNotFound(err):
framework.ExpectEqual(len(driverList.Items), numDriversBefore, "list should have %d items, got: %s", numDriversBefore, driverList) // Okay, normal case.
case err != nil:
framework.Failf("expected 404, got %#v", err)
case retrievedDriver.DeletionTimestamp != nil:
// Okay, normal case.
default:
framework.Failf("CSIDriver should have been deleted or have DeletionTimestamp, but instead got: %s", retrievedDriver)
}
}
}) })
// TODO: promote to framework.ConformanceIt // TODO: promote to framework.ConformanceIt