Skip to content

Commit d1e6898

Browse files
NiccoloFeimnencia
authored andcommitted
test: move VolumeMount tests in the Volume Utilities Describe
Signed-off-by: Niccolò Fei <[email protected]>
1 parent 24104db commit d1e6898

File tree

1 file changed

+72
-72
lines changed

1 file changed

+72
-72
lines changed

internal/cnpgi/operator/lifecycle_test.go

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -249,86 +249,86 @@ var _ = Describe("Volume utilities", func() {
249249
Expect(result).To(Equal(volumes))
250250
})
251251
})
252-
})
253252

254-
var _ = Describe("removeVolumeMount", func() {
255-
It("removes the specified volume mount", func() {
256-
mounts := []corev1.VolumeMount{
257-
{Name: "mount1"},
258-
{Name: "mount2"},
259-
{Name: "mount3"},
260-
}
261-
result := removeVolumeMount(mounts, "mount2")
262-
Expect(result).To(HaveLen(2))
263-
for _, m := range result {
264-
Expect(m.Name).NotTo(Equal("mount2"))
265-
}
266-
})
253+
Describe("removeVolumeMount", func() {
254+
It("removes the specified volume mount", func() {
255+
mounts := []corev1.VolumeMount{
256+
{Name: "mount1"},
257+
{Name: "mount2"},
258+
{Name: "mount3"},
259+
}
260+
result := removeVolumeMount(mounts, "mount2")
261+
Expect(result).To(HaveLen(2))
262+
for _, m := range result {
263+
Expect(m.Name).NotTo(Equal("mount2"))
264+
}
265+
})
267266

268-
It("returns the same list if the volume mount is not present", func() {
269-
mounts := []corev1.VolumeMount{{Name: "mount1"}, {Name: "mount2"}}
270-
result := removeVolumeMount(mounts, "mount3")
271-
Expect(result).To(HaveLen(2))
272-
Expect(result[0].Name).To(Equal("mount1"))
273-
Expect(result[1].Name).To(Equal("mount2"))
274-
})
267+
It("returns the same list if the volume mount is not present", func() {
268+
mounts := []corev1.VolumeMount{{Name: "mount1"}, {Name: "mount2"}}
269+
result := removeVolumeMount(mounts, "mount3")
270+
Expect(result).To(HaveLen(2))
271+
Expect(result[0].Name).To(Equal("mount1"))
272+
Expect(result[1].Name).To(Equal("mount2"))
273+
})
275274

276-
It("handles empty input slice", func() {
277-
var mounts []corev1.VolumeMount
278-
result := removeVolumeMount(mounts, "mount1")
279-
Expect(result).To(BeEmpty())
275+
It("handles empty input slice", func() {
276+
var mounts []corev1.VolumeMount
277+
result := removeVolumeMount(mounts, "mount1")
278+
Expect(result).To(BeEmpty())
279+
})
280280
})
281-
})
282281

283-
var _ = Describe("ensureVolumeMount", func() {
284-
It("adds a new volume mount to an empty list", func() {
285-
var mounts []corev1.VolumeMount
286-
newMount := corev1.VolumeMount{Name: "mount1", MountPath: "/path1"}
287-
result := ensureVolumeMount(mounts, newMount)
288-
Expect(result).To(HaveLen(1))
289-
Expect(result[0]).To(Equal(newMount))
290-
})
282+
Describe("ensureVolumeMount", func() {
283+
It("adds a new volume mount to an empty list", func() {
284+
var mounts []corev1.VolumeMount
285+
newMount := corev1.VolumeMount{Name: "mount1", MountPath: "/path1"}
286+
result := ensureVolumeMount(mounts, newMount)
287+
Expect(result).To(HaveLen(1))
288+
Expect(result[0]).To(Equal(newMount))
289+
})
291290

292-
It("adds a new volume mount to a non-empty list", func() {
293-
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
294-
newMount := corev1.VolumeMount{Name: "mount2", MountPath: "/path2"}
295-
result := ensureVolumeMount(mounts, newMount)
296-
Expect(result).To(HaveLen(2))
297-
Expect(result[0].Name).To(Equal("mount1"))
298-
Expect(result[1].Name).To(Equal("mount2"))
299-
})
291+
It("adds a new volume mount to a non-empty list", func() {
292+
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
293+
newMount := corev1.VolumeMount{Name: "mount2", MountPath: "/path2"}
294+
result := ensureVolumeMount(mounts, newMount)
295+
Expect(result).To(HaveLen(2))
296+
Expect(result[0].Name).To(Equal("mount1"))
297+
Expect(result[1].Name).To(Equal("mount2"))
298+
})
300299

301-
It("updates an existing volume mount", func() {
302-
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
303-
updatedMount := corev1.VolumeMount{Name: "mount1", MountPath: "/new-path"}
304-
result := ensureVolumeMount(mounts, updatedMount)
305-
Expect(result).To(HaveLen(1))
306-
Expect(result[0].MountPath).To(Equal("/new-path"))
307-
})
300+
It("updates an existing volume mount", func() {
301+
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
302+
updatedMount := corev1.VolumeMount{Name: "mount1", MountPath: "/new-path"}
303+
result := ensureVolumeMount(mounts, updatedMount)
304+
Expect(result).To(HaveLen(1))
305+
Expect(result[0].MountPath).To(Equal("/new-path"))
306+
})
308307

309-
It("adds multiple new volume mounts", func() {
310-
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
311-
newMount1 := corev1.VolumeMount{Name: "mount2", MountPath: "/path2"}
312-
newMount2 := corev1.VolumeMount{Name: "mount3", MountPath: "/path3"}
313-
result := ensureVolumeMount(mounts, newMount1, newMount2)
314-
Expect(result).To(HaveLen(3))
315-
Expect(result[0].Name).To(Equal("mount1"))
316-
Expect(result[1].Name).To(Equal("mount2"))
317-
Expect(result[2].Name).To(Equal("mount3"))
318-
})
308+
It("adds multiple new volume mounts", func() {
309+
mounts := []corev1.VolumeMount{{Name: "mount1", MountPath: "/path1"}}
310+
newMount1 := corev1.VolumeMount{Name: "mount2", MountPath: "/path2"}
311+
newMount2 := corev1.VolumeMount{Name: "mount3", MountPath: "/path3"}
312+
result := ensureVolumeMount(mounts, newMount1, newMount2)
313+
Expect(result).To(HaveLen(3))
314+
Expect(result[0].Name).To(Equal("mount1"))
315+
Expect(result[1].Name).To(Equal("mount2"))
316+
Expect(result[2].Name).To(Equal("mount3"))
317+
})
319318

320-
It("handles a mix of new and existing volume mounts", func() {
321-
mounts := []corev1.VolumeMount{
322-
{Name: "mount1", MountPath: "/path1"},
323-
{Name: "mount2", MountPath: "/path2"},
324-
}
325-
updatedMount := corev1.VolumeMount{Name: "mount1", MountPath: "/new-path"}
326-
newMount := corev1.VolumeMount{Name: "mount3", MountPath: "/path3"}
327-
result := ensureVolumeMount(mounts, updatedMount, newMount)
328-
Expect(result).To(HaveLen(3))
329-
Expect(result[0].Name).To(Equal("mount1"))
330-
Expect(result[0].MountPath).To(Equal("/new-path"))
331-
Expect(result[1].Name).To(Equal("mount2"))
332-
Expect(result[2].Name).To(Equal("mount3"))
319+
It("handles a mix of new and existing volume mounts", func() {
320+
mounts := []corev1.VolumeMount{
321+
{Name: "mount1", MountPath: "/path1"},
322+
{Name: "mount2", MountPath: "/path2"},
323+
}
324+
updatedMount := corev1.VolumeMount{Name: "mount1", MountPath: "/new-path"}
325+
newMount := corev1.VolumeMount{Name: "mount3", MountPath: "/path3"}
326+
result := ensureVolumeMount(mounts, updatedMount, newMount)
327+
Expect(result).To(HaveLen(3))
328+
Expect(result[0].Name).To(Equal("mount1"))
329+
Expect(result[0].MountPath).To(Equal("/new-path"))
330+
Expect(result[1].Name).To(Equal("mount2"))
331+
Expect(result[2].Name).To(Equal("mount3"))
332+
})
333333
})
334334
})

0 commit comments

Comments
 (0)