Skip to content

Commit cbd12ee

Browse files
hxrshxzhxrshxz
committed
test(fuse): finalize migrated test cleanup
Signed-off-by: Harsh <harshmastic@gmail.com>
1 parent 367a537 commit cbd12ee

File tree

8 files changed

+223
-198
lines changed

8 files changed

+223
-198
lines changed

‎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/injector_runtime_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ import (
3535
"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
3636
)
3737

38+
const injectorRuntimeTestBigDataNamespace = "big-data"
39+
3840
func newSchemeWithFuseTypes(t *testing.T) *runtime.Scheme {
3941
t.Helper()
4042
s := runtime.NewScheme()
@@ -51,7 +53,7 @@ func TestInjectList_Success(t *testing.T) {
5153

5254
s := newSchemeWithFuseTypes(t)
5355
dataset := &datav1alpha1.Dataset{
54-
ObjectMeta: metav1.ObjectMeta{Name: "duplicate", Namespace: "big-data"},
56+
ObjectMeta: metav1.ObjectMeta{Name: "duplicate", Namespace: injectorRuntimeTestBigDataNamespace},
5557
}
5658
pv := &corev1.PersistentVolume{
5759
ObjectMeta: metav1.ObjectMeta{Name: "big-data-duplicate"},
@@ -68,11 +70,11 @@ func TestInjectList_Success(t *testing.T) {
6870
},
6971
}
7072
pvc := &corev1.PersistentVolumeClaim{
71-
ObjectMeta: metav1.ObjectMeta{Name: "duplicate", Namespace: "big-data"},
73+
ObjectMeta: metav1.ObjectMeta{Name: "duplicate", Namespace: injectorRuntimeTestBigDataNamespace},
7274
Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "big-data-duplicate"},
7375
}
7476
fuse := &appsv1.DaemonSet{
75-
ObjectMeta: metav1.ObjectMeta{Name: "duplicate-jindofs-fuse", Namespace: "big-data"},
77+
ObjectMeta: metav1.ObjectMeta{Name: "duplicate-jindofs-fuse", Namespace: injectorRuntimeTestBigDataNamespace},
7678
Spec: appsv1.DaemonSetSpec{
7779
Template: corev1.PodTemplateSpec{
7880
Spec: corev1.PodSpec{
@@ -122,7 +124,7 @@ func TestInjectList_Success(t *testing.T) {
122124
TypeMeta: metav1.TypeMeta{Kind: "Pod", APIVersion: "v1"},
123125
ObjectMeta: metav1.ObjectMeta{
124126
Name: "duplicate-pvc-name",
125-
Namespace: "big-data",
127+
Namespace: injectorRuntimeTestBigDataNamespace,
126128
Labels: map[string]string{common.InjectFuseSidecar: common.True},
127129
},
128130
Spec: corev1.PodSpec{
@@ -153,7 +155,7 @@ func TestInjectList_Success(t *testing.T) {
153155
fakeClient := fake.NewFakeClientWithScheme(s, []runtime.Object{fuse, pv, pvc, dataset}...)
154156
injector := NewInjector(fakeClient)
155157

156-
runtimeInfo, err := base.BuildRuntimeInfo("duplicate", "big-data", common.JindoRuntime)
158+
runtimeInfo, err := base.BuildRuntimeInfo("duplicate", injectorRuntimeTestBigDataNamespace, common.JindoRuntime)
157159
require.NoError(t, err)
158160
runtimeInfo.SetAPIReader(fakeClient)
159161
runtimeInfos := map[string]base.RuntimeInfoInterface{"duplicate": runtimeInfo}
@@ -183,7 +185,7 @@ func TestInjectUnstructured_NotImplemented(t *testing.T) {
183185
TypeMeta: metav1.TypeMeta{Kind: "Pod", APIVersion: "v1"},
184186
ObjectMeta: metav1.ObjectMeta{
185187
Name: "duplicate-pvc-name",
186-
Namespace: "big-data",
188+
Namespace: injectorRuntimeTestBigDataNamespace,
187189
Labels: map[string]string{common.InjectFuseSidecar: common.True},
188190
},
189191
Spec: corev1.PodSpec{

‎pkg/application/inject/fuse/injector_test.go‎

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ import (
3737
"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
3838
)
3939

40+
const (
41+
injectorTestFluidNamespace = "fluid-test"
42+
injectorTestDataset1Name = "dataset-1"
43+
injectorTestFuse0Name = "fluid-fuse-0"
44+
injectorTestMetricsPort = "thin-fuse-metrics"
45+
)
46+
4047
// testCaseContext holds objects needed for injector test cases.
4148
type testCaseContext struct {
4249
in *corev1.Pod
@@ -286,7 +293,7 @@ func assertInjectionCorrect(t *testing.T, out *corev1.Pod, fuseDs *appsv1.Daemon
286293
}
287294

288295
func TestInjectPod_SingleDataset(t *testing.T) {
289-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
296+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
290297
injector, c := buildInjectorFromTestCtx(t, testCtx)
291298

292299
runtimeInfos := map[string]base.RuntimeInfoInterface{}
@@ -301,15 +308,15 @@ func TestInjectPod_SingleDataset(t *testing.T) {
301308

302309
fuseDs := testCtx.fuseDaemonsets[0]
303310
require.NoError(t, err)
304-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
305-
assert.Equal(t, "dataset-1", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
311+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
312+
assert.Equal(t, injectorTestDataset1Name, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
306313
assert.Len(t, out.Spec.Containers, 2)
307314

308315
assertInjectionCorrect(t, out, fuseDs, testCtx.datasets[0])
309316
}
310317

311318
func TestInjectPod_UserSpecifiedFields(t *testing.T) {
312-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
319+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
313320
testCtx.fuseDaemonsets[0].Spec.Template.Spec.Volumes = append(
314321
testCtx.fuseDaemonsets[0].Spec.Template.Spec.Volumes,
315322
corev1.Volume{Name: "new-vol", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}},
@@ -336,15 +343,15 @@ func TestInjectPod_UserSpecifiedFields(t *testing.T) {
336343

337344
fuseDs := testCtx.fuseDaemonsets[0]
338345
require.NoError(t, err)
339-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
340-
assert.Equal(t, "dataset-1", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
346+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
347+
assert.Equal(t, injectorTestDataset1Name, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
341348
assert.Len(t, out.Spec.Containers, 2)
342349

343350
assertInjectionCorrect(t, out, fuseDs, testCtx.datasets[0])
344351
}
345352

346353
func TestInjectPod_AlreadyInjected(t *testing.T) {
347-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
354+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
348355
testCtx.in.ObjectMeta.Labels[common.InjectSidecarDone] = common.True
349356
injector, c := buildInjectorFromTestCtx(t, testCtx)
350357

@@ -362,7 +369,7 @@ func TestInjectPod_AlreadyInjected(t *testing.T) {
362369
}
363370

364371
func TestInjectPod_DuplicatePVC(t *testing.T) {
365-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
372+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
366373
testCtx.in.Spec.Volumes = append(testCtx.in.Spec.Volumes, corev1.Volume{
367374
Name: "duplicate-pvc",
368375
VolumeSource: corev1.VolumeSource{
@@ -387,8 +394,8 @@ func TestInjectPod_DuplicatePVC(t *testing.T) {
387394

388395
out, err := injector.InjectPod(testCtx.in, runtimeInfos)
389396
require.NoError(t, err)
390-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
391-
assert.Equal(t, "dataset-1", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
397+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
398+
assert.Equal(t, injectorTestDataset1Name, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
392399
assert.Len(t, out.Spec.Containers, 2)
393400
assertInjectionCorrect(t, out, testCtx.fuseDaemonsets[0], testCtx.datasets[0])
394401

@@ -410,7 +417,7 @@ func TestInjectPod_DuplicatePVC(t *testing.T) {
410417
}
411418

412419
func TestInjectPod_UnprivilegedMutator(t *testing.T) {
413-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
420+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
414421
testCtx.in.Labels[common.InjectUnprivilegedFuseSidecar] = common.True
415422
injector, c := buildInjectorFromTestCtx(t, testCtx)
416423

@@ -425,8 +432,8 @@ func TestInjectPod_UnprivilegedMutator(t *testing.T) {
425432
out, err := injector.InjectPod(testCtx.in, runtimeInfos)
426433
require.NoError(t, err)
427434

428-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
429-
assert.Equal(t, "dataset-1", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
435+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
436+
assert.Equal(t, injectorTestDataset1Name, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
430437
assert.Len(t, out.Spec.Containers, 2)
431438

432439
fuseContainer := out.Spec.Containers[0]
@@ -440,7 +447,7 @@ func TestInjectPod_UnprivilegedMutator(t *testing.T) {
440447
}
441448

442449
func TestInjectPod_InitContainerWithPVC(t *testing.T) {
443-
testCtx := mockTestCaseContext([]string{"dataset-1"}, "fluid-test")
450+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name}, injectorTestFluidNamespace)
444451
testCtx.in.Spec.InitContainers = append(testCtx.in.Spec.InitContainers, corev1.Container{
445452
Name: "init-container",
446453
VolumeMounts: []corev1.VolumeMount{
@@ -477,7 +484,7 @@ func TestInjectPod_InitContainerWithPVC(t *testing.T) {
477484
}
478485

479486
func TestInjectPod_MultipleDatasets(t *testing.T) {
480-
testCtx := mockTestCaseContext([]string{"dataset-1", "dataset-2", "dataset-3"}, "fluid-test")
487+
testCtx := mockTestCaseContext([]string{injectorTestDataset1Name, "dataset-2", "dataset-3"}, injectorTestFluidNamespace)
481488
injector, c := buildInjectorFromTestCtx(t, testCtx)
482489

483490
runtimeInfos := map[string]base.RuntimeInfoInterface{}
@@ -491,11 +498,11 @@ func TestInjectPod_MultipleDatasets(t *testing.T) {
491498
out, err := injector.InjectPod(testCtx.in, runtimeInfos)
492499

493500
require.NoError(t, err)
494-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
495-
assert.Equal(t, "dataset-1", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
496-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-1"])
501+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
502+
assert.Equal(t, injectorTestDataset1Name, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
503+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-1"])
497504
assert.Equal(t, "dataset-2", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-1"])
498-
assert.Equal(t, "fluid-test", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-2"])
505+
assert.Equal(t, injectorTestFluidNamespace, out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-2"])
499506
assert.Equal(t, "dataset-3", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-2"])
500507
assert.Len(t, out.Spec.Containers, 4)
501508

@@ -505,27 +512,29 @@ func TestInjectPod_MultipleDatasets(t *testing.T) {
505512
}
506513

507514
func TestInjectPod_RefDataset(t *testing.T) {
508-
testCtx := mockTestCaseContext([]string{"root-dataset"}, "fluid-test")
515+
const subDatasetName = "sub-dataset"
516+
517+
testCtx := mockTestCaseContext([]string{"root-dataset"}, injectorTestFluidNamespace)
509518
testCtx.datasets = append(testCtx.datasets, &datav1alpha1.Dataset{
510-
ObjectMeta: metav1.ObjectMeta{Name: "sub-dataset", Namespace: "ref"},
519+
ObjectMeta: metav1.ObjectMeta{Name: subDatasetName, Namespace: "ref"},
511520
Spec: datav1alpha1.DatasetSpec{
512-
Mounts: []datav1alpha1.Mount{{MountPoint: "dataset://fluid-test/root-dataset/path-a"}},
521+
Mounts: []datav1alpha1.Mount{{MountPoint: "dataset://" + injectorTestFluidNamespace + "/root-dataset/path-a"}},
513522
},
514523
})
515524

516525
testCtx.pvcs = append(testCtx.pvcs, &corev1.PersistentVolumeClaim{
517-
ObjectMeta: metav1.ObjectMeta{Name: "sub-dataset", Namespace: "ref"},
518-
Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "ref-sub-dataset"},
526+
ObjectMeta: metav1.ObjectMeta{Name: subDatasetName, Namespace: "ref"},
527+
Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "ref-" + subDatasetName},
519528
})
520529

521530
testCtx.pvs = append(testCtx.pvs, &corev1.PersistentVolume{
522-
ObjectMeta: metav1.ObjectMeta{Name: "ref-sub-dataset"},
531+
ObjectMeta: metav1.ObjectMeta{Name: "ref-" + subDatasetName},
523532
Spec: corev1.PersistentVolumeSpec{
524533
PersistentVolumeSource: corev1.PersistentVolumeSource{
525534
CSI: &corev1.CSIPersistentVolumeSource{
526535
Driver: "fuse.csi.fluid.io",
527536
VolumeAttributes: map[string]string{
528-
common.VolumeAttrFluidPath: "/runtime-mnt/thin/fluid-test/root-dataset/thin-fuse",
537+
common.VolumeAttrFluidPath: "/runtime-mnt/thin/" + injectorTestFluidNamespace + "/root-dataset/thin-fuse",
529538
common.VolumeAttrMountType: common.ThinRuntime,
530539
common.VolumeAttrFluidSubPath: "path-a",
531540
},
@@ -537,18 +546,18 @@ func TestInjectPod_RefDataset(t *testing.T) {
537546
testCtx.in.Namespace = "ref"
538547
testCtx.in.Spec.Volumes = []corev1.Volume{
539548
{
540-
Name: "sub-dataset",
549+
Name: subDatasetName,
541550
VolumeSource: corev1.VolumeSource{
542-
PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: "sub-dataset"},
551+
PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: subDatasetName},
543552
},
544553
},
545554
}
546555
testCtx.in.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{
547-
{Name: "sub-dataset", MountPath: "/data"},
556+
{Name: subDatasetName, MountPath: "/data"},
548557
}
549558

550559
subDatasetFuseDs := testCtx.fuseDaemonsets[0].DeepCopy()
551-
subDatasetFuseDs.Name = "sub-dataset-fuse"
560+
subDatasetFuseDs.Name = subDatasetName + "-fuse"
552561
subDatasetFuseDs.Namespace = "ref"
553562
testCtx.fuseDaemonsets = append(testCtx.fuseDaemonsets, subDatasetFuseDs)
554563

@@ -567,8 +576,8 @@ func TestInjectPod_RefDataset(t *testing.T) {
567576
refDataset := testCtx.datasets[1]
568577
rootDataset := testCtx.datasets[0]
569578
require.NoError(t, err)
570-
assert.Equal(t, "ref", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+"fluid-fuse-0"])
571-
assert.Equal(t, "sub-dataset", out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+"fluid-fuse-0"])
579+
assert.Equal(t, "ref", out.ObjectMeta.Labels[common.LabelContainerDatasetNamespaceKeyPrefix+injectorTestFuse0Name])
580+
assert.Equal(t, subDatasetName, out.ObjectMeta.Labels[common.LabelContainerDatasetNameKeyPrefix+injectorTestFuse0Name])
572581
assert.Len(t, out.Spec.Containers, 2)
573582

574583
assert.Subset(t, out.Spec.Containers[containerIdx].Command, fuseDs.Spec.Template.Spec.Containers[0].Command)
@@ -599,9 +608,9 @@ func TestInjectPod_RefDataset(t *testing.T) {
599608
}
600609

601610
func TestInjectPod_FuseMetrics_ScrapeAll(t *testing.T) {
602-
testCtx := mockTestCaseContext([]string{"dataset-with-fuse-metrics"}, "fluid-test")
611+
testCtx := mockTestCaseContext([]string{"dataset-with-fuse-metrics"}, injectorTestFluidNamespace)
603612
testCtx.fuseDaemonsets[0].Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
604-
{Name: "thin-fuse-metrics", ContainerPort: 8080},
613+
{Name: injectorTestMetricsPort, ContainerPort: 8080},
605614
}
606615
injector, c := buildInjectorFromTestCtx(t, testCtx)
607616

@@ -629,13 +638,13 @@ func TestInjectPod_FuseMetrics_ScrapeAll(t *testing.T) {
629638
}
630639
}
631640
require.NotNil(t, fuseContainer)
632-
assert.Contains(t, fuseContainer.Ports, corev1.ContainerPort{Name: "thin-fuse-metrics", ContainerPort: 8080})
641+
assert.Contains(t, fuseContainer.Ports, corev1.ContainerPort{Name: injectorTestMetricsPort, ContainerPort: 8080})
633642
}
634643

635644
func TestInjectPod_FuseMetrics_MountPodOnly(t *testing.T) {
636-
testCtx := mockTestCaseContext([]string{"dataset-with-mountpod-scrape-target"}, "fluid-test")
645+
testCtx := mockTestCaseContext([]string{"dataset-with-mountpod-scrape-target"}, injectorTestFluidNamespace)
637646
testCtx.fuseDaemonsets[0].Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
638-
{Name: "thin-fuse-metrics", ContainerPort: 8080},
647+
{Name: injectorTestMetricsPort, ContainerPort: 8080},
639648
}
640649
injector, c := buildInjectorFromTestCtx(t, testCtx)
641650

@@ -663,13 +672,13 @@ func TestInjectPod_FuseMetrics_MountPodOnly(t *testing.T) {
663672
}
664673
}
665674
require.NotNil(t, fuseContainer)
666-
assert.NotContains(t, fuseContainer.Ports, corev1.ContainerPort{Name: "thin-fuse-metrics", ContainerPort: 8080})
675+
assert.NotContains(t, fuseContainer.Ports, corev1.ContainerPort{Name: injectorTestMetricsPort, ContainerPort: 8080})
667676
}
668677

669678
func TestInjectPod_FuseMetrics_SidecarOnly(t *testing.T) {
670-
testCtx := mockTestCaseContext([]string{"dataset-with-sidecar-scrape-target"}, "fluid-test")
679+
testCtx := mockTestCaseContext([]string{"dataset-with-sidecar-scrape-target"}, injectorTestFluidNamespace)
671680
testCtx.fuseDaemonsets[0].Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
672-
{Name: "thin-fuse-metrics", ContainerPort: 8080},
681+
{Name: injectorTestMetricsPort, ContainerPort: 8080},
673682
}
674683
injector, c := buildInjectorFromTestCtx(t, testCtx)
675684

@@ -697,5 +706,5 @@ func TestInjectPod_FuseMetrics_SidecarOnly(t *testing.T) {
697706
}
698707
}
699708
require.NotNil(t, fuseContainer)
700-
assert.Contains(t, fuseContainer.Ports, corev1.ContainerPort{Name: "thin-fuse-metrics", ContainerPort: 8080})
709+
assert.Contains(t, fuseContainer.Ports, corev1.ContainerPort{Name: injectorTestMetricsPort, ContainerPort: 8080})
701710
}

0 commit comments

Comments
 (0)