From b3fe7a6410d3720cc4b7598e9d04289a16742c27 Mon Sep 17 00:00:00 2001 From: huweiwen Date: Tue, 12 Dec 2023 15:54:25 +0800 Subject: [PATCH] fix ExistingPodExistingVolume test case the previous code is identical with NewPodNewVolume --- .../cache/desired_state_of_world_test.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go b/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go index 0c289f84f2c..970d52b8aa6 100644 --- a/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go +++ b/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go @@ -89,8 +89,8 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) { dsw := NewDesiredStateOfWorld(volumePluginMgr, seLinuxTranslator) pod := &v1.Pod{ ObjectMeta: metav1.ObjectMeta{ - Name: "pod3", - UID: "pod3uid", + Name: "pod4", + UID: "pod4uid", }, Spec: v1.PodSpec{ Volumes: []v1.Volume{ @@ -112,12 +112,19 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) { // Act generatedVolumeName, err := dsw.AddPodToVolume( podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */) - - // Assert + if err != nil { + t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) + } + generatedVolumeName2, err := dsw.AddPodToVolume( + podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */) if err != nil { t.Fatalf("AddPodToVolume failed. Expected: Actual: <%v>", err) } + // Assert + if generatedVolumeName != generatedVolumeName2 { + t.Fatalf("AddPodToVolume should generate same names, but got %q != %q", generatedVolumeName, generatedVolumeName2) + } verifyVolumeExistsDsw(t, generatedVolumeName, "" /* SELinuxContext */, dsw) verifyVolumeExistsInVolumesToMount( t, generatedVolumeName, false /* expectReportedInUse */, dsw)