github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

deflake volume tests

Browse Source
This commit is contained in:
carlory 2024-12-23 16:59:45 +08:00
parent a4b8a3b2e3
commit e99fea7e3f
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/storage/drivers/csi.go
View File

@ -235,7 +235,6 @@ func (h *hostpathCSIDriver) PrepareTest(ctx context.Context, f *framework.Framew
// Create secondary namespace which will be used for creating driver // Create secondary namespace which will be used for creating driver
driverNamespace := utils.CreateDriverNamespace(ctx, f) driverNamespace := utils.CreateDriverNamespace(ctx, f)
driverns := driverNamespace.Name driverns := driverNamespace.Name
testns := f.Namespace.Name
ginkgo.By(fmt.Sprintf("deploying %s driver", h.driverInfo.Name)) ginkgo.By(fmt.Sprintf("deploying %s driver", h.driverInfo.Name))
cancelLogging := utils.StartPodLogs(ctx, f, driverNamespace) cancelLogging := utils.StartPodLogs(ctx, f, driverNamespace)
@ -328,7 +327,6 @@ func (h *hostpathCSIDriver) PrepareTest(ctx context.Context, f *framework.Framew
cleanupFunc := generateDriverCleanupFunc( cleanupFunc := generateDriverCleanupFunc(
f, f,
h.driverInfo.Name, h.driverInfo.Name,
testns,
driverns, driverns,
cancelLogging) cancelLogging)
ginkgo.DeferCleanup(cleanupFunc) ginkgo.DeferCleanup(cleanupFunc)
@ -600,7 +598,6 @@ func (m *mockCSIDriver) PrepareTest(ctx context.Context, f *framework.Framework)
// Create secondary namespace which will be used for creating driver // Create secondary namespace which will be used for creating driver
m.driverNamespace = utils.CreateDriverNamespace(ctx, f) m.driverNamespace = utils.CreateDriverNamespace(ctx, f)
driverns := m.driverNamespace.Name driverns := m.driverNamespace.Name
testns := f.Namespace.Name
if m.embedded { if m.embedded {
ginkgo.By("deploying csi mock proxy") ginkgo.By("deploying csi mock proxy")
@ -762,7 +759,6 @@ func (m *mockCSIDriver) PrepareTest(ctx context.Context, f *framework.Framework)
driverCleanupFunc := generateDriverCleanupFunc( driverCleanupFunc := generateDriverCleanupFunc(
f, f,
"mock", "mock",
testns,
driverns, driverns,
cancelLogging) cancelLogging)
@ -942,7 +938,6 @@ func (g *gcePDCSIDriver) GetSnapshotClass(ctx context.Context, config *storagefr
} }
func (g *gcePDCSIDriver) PrepareTest(ctx context.Context, f *framework.Framework) *storageframework.PerTestConfig { func (g *gcePDCSIDriver) PrepareTest(ctx context.Context, f *framework.Framework) *storageframework.PerTestConfig {
testns := f.Namespace.Name
cfg := &storageframework.PerTestConfig{ cfg := &storageframework.PerTestConfig{
Driver: g, Driver: g,
Prefix: "gcepd", Prefix: "gcepd",
@ -1000,7 +995,6 @@ func (g *gcePDCSIDriver) PrepareTest(ctx context.Context, f *framework.Framework
cleanupFunc := generateDriverCleanupFunc( cleanupFunc := generateDriverCleanupFunc(
f, f,
"gce-pd", "gce-pd",
testns,
driverns, driverns,
cancelLogging) cancelLogging)
ginkgo.DeferCleanup(cleanupFunc) ginkgo.DeferCleanup(cleanupFunc)
@ -1073,17 +1067,12 @@ func tryFunc(f func()) error {
func generateDriverCleanupFunc( func generateDriverCleanupFunc(
f *framework.Framework, f *framework.Framework,
driverName, testns, driverns string, driverName, driverns string,
cancelLogging func()) func(ctx context.Context) { cancelLogging func()) func(ctx context.Context) {
// Cleanup CSI driver and namespaces. This function needs to be idempotent and can be // Cleanup CSI driver and namespaces. This function needs to be idempotent and can be
// concurrently called from defer (or AfterEach) and AfterSuite action hooks. // concurrently called from defer (or AfterEach) and AfterSuite action hooks.
cleanupFunc := func(ctx context.Context) { cleanupFunc := func(ctx context.Context) {
ginkgo.By(fmt.Sprintf("deleting the test namespace: %s", testns))
// Delete the primary namespace but it's okay to fail here because this namespace will
// also be deleted by framework.Aftereach hook
_ = tryFunc(func() { f.DeleteNamespace(ctx, testns) })
ginkgo.By(fmt.Sprintf("uninstalling csi %s driver", driverName)) ginkgo.By(fmt.Sprintf("uninstalling csi %s driver", driverName))
_ = tryFunc(cancelLogging) _ = tryFunc(cancelLogging)