Skip to content

Commit 2adcc5d

Browse files
committed
test(fuse): dedupe remaining test literals
Signed-off-by: Harsh <harshmastic@gmail.com>
1 parent 0c4acda commit 2adcc5d

4 files changed

Lines changed: 89 additions & 98 deletions

File tree

pkg/application/inject/fuse/container_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
corev1 "k8s.io/api/core/v1"
2525
)
2626

27+
const testFuseSidecarName0 = "fluid-fuse-0"
28+
2729
func TestFindInjectedSidecars_NoSidecars(t *testing.T) {
2830
pod1 := &corev1.Pod{
2931
Spec: corev1.PodSpec{
@@ -45,7 +47,7 @@ func TestFindInjectedSidecars_OneSidecar(t *testing.T) {
4547
pod2 := &corev1.Pod{
4648
Spec: corev1.PodSpec{
4749
Containers: []corev1.Container{
48-
{Name: "fluid-fuse-0"},
50+
{Name: testFuseSidecarName0},
4951
{Name: "test"},
5052
},
5153
},
@@ -56,14 +58,14 @@ func TestFindInjectedSidecars_OneSidecar(t *testing.T) {
5658
injectedSidecars, err := findInjectedSidecars(podObjs[0])
5759
assert.NoError(t, err)
5860
assert.Len(t, injectedSidecars, 1)
59-
assert.Equal(t, "fluid-fuse-0", injectedSidecars[0].Name)
61+
assert.Equal(t, testFuseSidecarName0, injectedSidecars[0].Name)
6062
}
6163

6264
func TestFindInjectedSidecars_MultipleSidecars(t *testing.T) {
6365
pod3 := &corev1.Pod{
6466
Spec: corev1.PodSpec{
6567
Containers: []corev1.Container{
66-
{Name: "fluid-fuse-0"},
68+
{Name: testFuseSidecarName0},
6769
{Name: "test"},
6870
{Name: "fluid-fuse-1"},
6971
{Name: "fluid-fuse-dataset-xyz"},
@@ -76,7 +78,7 @@ func TestFindInjectedSidecars_MultipleSidecars(t *testing.T) {
7678
injectedSidecars, err := findInjectedSidecars(podObjs[0])
7779
assert.NoError(t, err)
7880
assert.Len(t, injectedSidecars, 3)
79-
assert.Equal(t, "fluid-fuse-0", injectedSidecars[0].Name)
81+
assert.Equal(t, testFuseSidecarName0, injectedSidecars[0].Name)
8082
assert.Equal(t, "fluid-fuse-1", injectedSidecars[1].Name)
8183
assert.Equal(t, "fluid-fuse-dataset-xyz", injectedSidecars[2].Name)
8284
}
@@ -86,7 +88,7 @@ func TestFindInjectedSidecars_PrefixOnly(t *testing.T) {
8688
Spec: corev1.PodSpec{
8789
Containers: []corev1.Container{
8890
{Name: "test-fluid-fuse"},
89-
{Name: "fluid-fuse-0"},
91+
{Name: testFuseSidecarName0},
9092
},
9193
},
9294
}
@@ -96,5 +98,5 @@ func TestFindInjectedSidecars_PrefixOnly(t *testing.T) {
9698
injectedSidecars, err := findInjectedSidecars(podObjs[0])
9799
assert.NoError(t, err)
98100
assert.Len(t, injectedSidecars, 1)
99-
assert.Equal(t, "fluid-fuse-0", injectedSidecars[0].Name)
101+
assert.Equal(t, testFuseSidecarName0, injectedSidecars[0].Name)
100102
}

pkg/application/inject/fuse/mount_point_script_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ func TestCollectDatasetVolumeMountInfo_NonPVCVolume(t *testing.T) {
281281
}
282282

283283
func TestCollectDatasetVolumeMountInfo_PVCNotInRuntimeInfos(t *testing.T) {
284-
volMounts := []corev1.VolumeMount{{Name: "data-volume", MountPath: "/data"}}
284+
volMounts := []corev1.VolumeMount{{Name: mountPointDataVolumeName, MountPath: "/data"}}
285285
volumes := []corev1.Volume{
286286
{
287-
Name: "data-volume",
287+
Name: mountPointDataVolumeName,
288288
VolumeSource: corev1.VolumeSource{
289289
PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: "unknown-pvc"},
290290
},

0 commit comments

Comments
 (0)