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

Remove unused parameters from TestConcurrentAccessToRelatedVolumes

Browse Source
This commit is contained in:
Jan Safranek 2021-06-10 10:40:25 +02:00
parent 046f93b113
commit 68f139548b
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/storage/testsuites/multivolume.go
View File

@ -381,8 +381,7 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p
}() }()
// Test access to both volumes on the same node. // Test access to both volumes on the same node.
TestConcurrentAccessToRelatedVolumes(l.config.Framework, l.cs, l.ns.Name, TestConcurrentAccessToRelatedVolumes(l.config.Framework, l.cs, l.ns.Name, l.config.ClientNodeSelection, pvcs)
l.config.ClientNodeSelection, pvcs, true /* sameNode */, false /* readOnly */)
}) })
// This tests below configuration: // This tests below configuration:
@ -426,8 +425,7 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p
}() }()
// Test access to both volumes on the same node. // Test access to both volumes on the same node.
TestConcurrentAccessToRelatedVolumes(l.config.Framework, l.cs, l.ns.Name, TestConcurrentAccessToRelatedVolumes(l.config.Framework, l.cs, l.ns.Name, l.config.ClientNodeSelection, pvcs)
l.config.ClientNodeSelection, pvcs, true /* sameNode */, false /* readOnly */)
}) })
// This tests below configuration: // This tests below configuration:
@ -696,8 +694,7 @@ func TestConcurrentAccessToSingleVolume(f *framework.Framework, cs clientset.Int
// Each provided PVC is used by a single pod. The test ensures that volumes created from // Each provided PVC is used by a single pod. The test ensures that volumes created from
// another volume (=clone) or volume snapshot can be used together with the original volume. // another volume (=clone) or volume snapshot can be used together with the original volume.
func TestConcurrentAccessToRelatedVolumes(f *framework.Framework, cs clientset.Interface, ns string, func TestConcurrentAccessToRelatedVolumes(f *framework.Framework, cs clientset.Interface, ns string,
node e2epod.NodeSelection, pvcs []*v1.PersistentVolumeClaim, requiresSameNode bool, node e2epod.NodeSelection, pvcs []*v1.PersistentVolumeClaim) {
readOnly bool) {
var pods []*v1.Pod var pods []*v1.Pod
@ -710,7 +707,7 @@ func TestConcurrentAccessToRelatedVolumes(f *framework.Framework, cs clientset.I
PVCs: []*v1.PersistentVolumeClaim{pvcs[i]}, PVCs: []*v1.PersistentVolumeClaim{pvcs[i]},
SeLinuxLabel: e2epod.GetLinuxLabel(), SeLinuxLabel: e2epod.GetLinuxLabel(),
NodeSelection: node, NodeSelection: node,
PVCsReadOnly: readOnly, PVCsReadOnly: false,
ImageID: e2epod.GetTestImageID(imageutils.JessieDnsutils), ImageID: e2epod.GetTestImageID(imageutils.JessieDnsutils),
} }
pod, err := e2epod.CreateSecPodWithNodeSelection(cs, &podConfig, f.Timeouts.PodStart) pod, err := e2epod.CreateSecPodWithNodeSelection(cs, &podConfig, f.Timeouts.PodStart)
@ -721,17 +718,8 @@ func TestConcurrentAccessToRelatedVolumes(f *framework.Framework, cs clientset.I
pods = append(pods, pod) pods = append(pods, pod)
actualNodeName := pod.Spec.NodeName actualNodeName := pod.Spec.NodeName
// Set affinity depending on requiresSameNode // Always run the subsequent pods on the same node.
if requiresSameNode { e2epod.SetAffinity(&node, actualNodeName)
e2epod.SetAffinity(&node, actualNodeName)
} else {
e2epod.SetAntiAffinity(&node, actualNodeName)
}
}
// Delete the last pod and remove from slice of pods
if len(pods) < len(pvcs) {
framework.Failf("Number of pods shouldn't be less than %d, but got %d", len(pvcs), len(pods))
} }
} }