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

e2e storage: pass around topologyTest pointer

Browse Source 
Copying the instance makes no sense because the fields are meant to be shared
between test and cleanup code.
This commit is contained in:
Patrick Ohly 2022-12-14 11:49:20 +01:00
parent 093c5964f7
commit bf1d1dfd0f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/storage/testsuites/topology.go
View File

@ -104,9 +104,9 @@ func (t *topologyTestSuite) DefineTests(driver storageframework.TestDriver, patt
f := framework.NewFrameworkWithCustomTimeouts("topology", storageframework.GetDriverTimeouts(driver)) f := framework.NewFrameworkWithCustomTimeouts("topology", storageframework.GetDriverTimeouts(driver))
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
init := func() topologyTest { init := func() *topologyTest {
dDriver, _ = driver.(storageframework.DynamicPVTestDriver) dDriver, _ = driver.(storageframework.DynamicPVTestDriver)
l := topologyTest{} l := &topologyTest{}
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
l.config = driver.PrepareTest(f) l.config = driver.PrepareTest(f)
@ -123,7 +123,7 @@ func (t *topologyTestSuite) DefineTests(driver storageframework.TestDriver, patt
e2eskipper.Skipf("Driver didn't provide topology keys -- skipping") e2eskipper.Skipf("Driver didn't provide topology keys -- skipping")
} }
ginkgo.DeferCleanup(t.CleanupResources, cs, &l) ginkgo.DeferCleanup(t.CleanupResources, cs, l)
if dInfo.NumAllowedTopologies == 0 { if dInfo.NumAllowedTopologies == 0 {
// Any plugin that supports topology defaults to 1 topology // Any plugin that supports topology defaults to 1 topology
@ -166,7 +166,7 @@ func (t *topologyTestSuite) DefineTests(driver storageframework.TestDriver, patt
} }
allowedTopologies := t.setAllowedTopologies(l.resource.Sc, l.allTopologies, excludedIndex) allowedTopologies := t.setAllowedTopologies(l.resource.Sc, l.allTopologies, excludedIndex)
t.createResources(cs, &l, nil) t.createResources(cs, l, nil)
err = e2epod.WaitTimeoutForPodRunningInNamespace(cs, l.pod.Name, l.pod.Namespace, f.Timeouts.PodStart) err = e2epod.WaitTimeoutForPodRunningInNamespace(cs, l.pod.Name, l.pod.Namespace, f.Timeouts.PodStart)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -213,7 +213,7 @@ func (t *topologyTestSuite) DefineTests(driver storageframework.TestDriver, patt
}, },
}, },
} }
t.createResources(cs, &l, affinity) t.createResources(cs, l, affinity)
// Wait for pod to fail scheduling // Wait for pod to fail scheduling
// With delayed binding, the scheduler errors before provisioning // With delayed binding, the scheduler errors before provisioning