Skip to content

Commit b3fe7a6

Browse files
committed
fix ExistingPodExistingVolume test case
the previous code is identical with NewPodNewVolume
1 parent b8777bc commit b3fe7a6

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) {
8989
dsw := NewDesiredStateOfWorld(volumePluginMgr, seLinuxTranslator)
9090
pod := &v1.Pod{
9191
ObjectMeta: metav1.ObjectMeta{
92-
Name: "pod3",
93-
UID: "pod3uid",
92+
Name: "pod4",
93+
UID: "pod4uid",
9494
},
9595
Spec: v1.PodSpec{
9696
Volumes: []v1.Volume{
@@ -112,12 +112,19 @@ func Test_AddPodToVolume_Positive_ExistingPodExistingVolume(t *testing.T) {
112112
// Act
113113
generatedVolumeName, err := dsw.AddPodToVolume(
114114
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
115-
116-
// Assert
115+
if err != nil {
116+
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
117+
}
118+
generatedVolumeName2, err := dsw.AddPodToVolume(
119+
podName, pod, volumeSpec, volumeSpec.Name(), "" /* volumeGIDValue */, nil /* seLinuxContainerContexts */)
117120
if err != nil {
118121
t.Fatalf("AddPodToVolume failed. Expected: <no error> Actual: <%v>", err)
119122
}
120123

124+
// Assert
125+
if generatedVolumeName != generatedVolumeName2 {
126+
t.Fatalf("AddPodToVolume should generate same names, but got %q != %q", generatedVolumeName, generatedVolumeName2)
127+
}
121128
verifyVolumeExistsDsw(t, generatedVolumeName, "" /* SELinuxContext */, dsw)
122129
verifyVolumeExistsInVolumesToMount(
123130
t, generatedVolumeName, false /* expectReportedInUse */, dsw)

0 commit comments

Comments
 (0)