Skip to content

Commit 3fa547b

Browse files
hxrshxzhxrshxz
authored
test(thin): migrate transform_resources_test.go to Ginkgo/Gomega (#5624)
* test(thin): migrate transform_resources_test.go to Ginkgo/Gomega Signed-off-by: Harsh <harshmastic@gmail.com> * test(thin): fix suite package name for Ginkgo test discovery Changed thin_suite_test.go from package thin_test to package thin to match all other test files in the package. This ensures Ginkgo specs are properly discovered and executed with go test. Addresses Copilot review feedback - package mismatch was preventing 26 Ginkgo specs from running. Signed-off-by: Harsh <harshmastic@gmail.com> --------- Signed-off-by: Harsh <harshmastic@gmail.com>
1 parent 2e32a5e commit 3fa547b

1 file changed

Lines changed: 82 additions & 88 deletions

File tree

‎pkg/ddc/thin/transform_resources_test.go‎

Lines changed: 82 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -17,106 +17,100 @@
1717
package thin
1818

1919
import (
20-
"testing"
21-
2220
datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
2321
"github.com/fluid-cloudnative/fluid/pkg/ddc/base"
2422
"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
23+
. "github.com/onsi/ginkgo/v2"
24+
. "github.com/onsi/gomega"
2525
corev1 "k8s.io/api/core/v1"
2626
"k8s.io/apimachinery/pkg/api/resource"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
)
2929

30-
func TestThinEngine_transformResourcesForFuse(t1 *testing.T) {
31-
var tests = []struct {
32-
runtime *datav1alpha1.ThinRuntime
33-
value *ThinValue
34-
}{
35-
{&datav1alpha1.ThinRuntime{
36-
ObjectMeta: metav1.ObjectMeta{
37-
Name: "test",
38-
},
39-
Spec: datav1alpha1.ThinRuntimeSpec{
40-
Fuse: datav1alpha1.ThinFuseSpec{
41-
Resources: corev1.ResourceRequirements{
42-
Limits: corev1.ResourceList{
43-
corev1.ResourceMemory: resource.MustParse("2Gi"),
44-
corev1.ResourceCPU: resource.MustParse("2"),
45-
},
46-
Requests: corev1.ResourceList{
47-
corev1.ResourceMemory: resource.MustParse("2Gi"),
48-
corev1.ResourceCPU: resource.MustParse("2"),
30+
var _ = Describe("ThinEngine_transformResources", func() {
31+
Describe("transformResourcesForFuse", func() {
32+
It("should correctly transform fuse resources", func() {
33+
runtime := &datav1alpha1.ThinRuntime{
34+
ObjectMeta: metav1.ObjectMeta{
35+
Name: "test",
36+
},
37+
Spec: datav1alpha1.ThinRuntimeSpec{
38+
Fuse: datav1alpha1.ThinFuseSpec{
39+
Resources: corev1.ResourceRequirements{
40+
Limits: corev1.ResourceList{
41+
corev1.ResourceMemory: resource.MustParse("2Gi"),
42+
corev1.ResourceCPU: resource.MustParse("2"),
43+
},
44+
Requests: corev1.ResourceList{
45+
corev1.ResourceMemory: resource.MustParse("2Gi"),
46+
corev1.ResourceCPU: resource.MustParse("2"),
47+
},
4948
},
5049
},
5150
},
52-
},
53-
}, &ThinValue{}},
54-
}
55-
for _, test := range tests {
56-
engine := &ThinEngine{
57-
Log: fake.NullLogger(),
58-
name: test.runtime.Name,
59-
}
60-
engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "thin", base.WithTieredStore(test.runtime.Spec.TieredStore))
61-
engine.UnitTest = true
62-
engine.transformResourcesForFuse(test.runtime.Spec.Fuse.Resources, test.value)
63-
wantMemReq := test.runtime.Spec.Fuse.Resources.Requests[corev1.ResourceMemory]
64-
wantCpuReq := test.runtime.Spec.Fuse.Resources.Requests[corev1.ResourceCPU]
65-
wantMemLim := test.runtime.Spec.Fuse.Resources.Limits[corev1.ResourceMemory]
66-
wantCpuLim := test.runtime.Spec.Fuse.Resources.Limits[corev1.ResourceCPU]
67-
if (len(test.runtime.Spec.Fuse.Resources.Requests) != 0 &&
68-
(wantMemReq.String() != test.value.Fuse.Resources.Requests[corev1.ResourceMemory] || wantCpuReq.String() != test.value.Fuse.Resources.Requests[corev1.ResourceCPU])) ||
69-
(len(test.runtime.Spec.Fuse.Resources.Limits) != 0 &&
70-
(wantMemLim.String() != test.value.Fuse.Resources.Limits[corev1.ResourceMemory] || wantCpuLim.String() != test.value.Fuse.Resources.Limits[corev1.ResourceCPU])) {
71-
t1.Errorf("expected %v, got %v", test.runtime.Spec.Fuse.Resources, test.value.Fuse.Resources)
72-
}
73-
}
74-
}
51+
}
52+
value := &ThinValue{}
7553

76-
func TestThinEngine_transformResourcesForWorker(t1 *testing.T) {
77-
var tests = []struct {
78-
runtime *datav1alpha1.ThinRuntime
79-
value *ThinValue
80-
}{
81-
{&datav1alpha1.ThinRuntime{
82-
ObjectMeta: metav1.ObjectMeta{
83-
Name: "test",
84-
},
85-
Spec: datav1alpha1.ThinRuntimeSpec{
86-
Worker: datav1alpha1.ThinCompTemplateSpec{
87-
Resources: corev1.ResourceRequirements{
88-
Limits: corev1.ResourceList{
89-
corev1.ResourceMemory: resource.MustParse("2Gi"),
90-
corev1.ResourceCPU: resource.MustParse("2"),
91-
},
92-
Requests: corev1.ResourceList{
93-
corev1.ResourceMemory: resource.MustParse("2Gi"),
94-
corev1.ResourceCPU: resource.MustParse("2"),
54+
engine := &ThinEngine{
55+
Log: fake.NullLogger(),
56+
name: runtime.Name,
57+
}
58+
engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "thin", base.WithTieredStore(runtime.Spec.TieredStore))
59+
engine.UnitTest = true
60+
engine.transformResourcesForFuse(runtime.Spec.Fuse.Resources, value)
61+
62+
wantMemReq := runtime.Spec.Fuse.Resources.Requests[corev1.ResourceMemory]
63+
wantCpuReq := runtime.Spec.Fuse.Resources.Requests[corev1.ResourceCPU]
64+
wantMemLim := runtime.Spec.Fuse.Resources.Limits[corev1.ResourceMemory]
65+
wantCpuLim := runtime.Spec.Fuse.Resources.Limits[corev1.ResourceCPU]
66+
67+
Expect(value.Fuse.Resources.Requests[corev1.ResourceMemory]).To(Equal(wantMemReq.String()))
68+
Expect(value.Fuse.Resources.Requests[corev1.ResourceCPU]).To(Equal(wantCpuReq.String()))
69+
Expect(value.Fuse.Resources.Limits[corev1.ResourceMemory]).To(Equal(wantMemLim.String()))
70+
Expect(value.Fuse.Resources.Limits[corev1.ResourceCPU]).To(Equal(wantCpuLim.String()))
71+
})
72+
})
73+
74+
Describe("transformResourcesForWorker", func() {
75+
It("should correctly transform worker resources", func() {
76+
runtime := &datav1alpha1.ThinRuntime{
77+
ObjectMeta: metav1.ObjectMeta{
78+
Name: "test",
79+
},
80+
Spec: datav1alpha1.ThinRuntimeSpec{
81+
Worker: datav1alpha1.ThinCompTemplateSpec{
82+
Resources: corev1.ResourceRequirements{
83+
Limits: corev1.ResourceList{
84+
corev1.ResourceMemory: resource.MustParse("2Gi"),
85+
corev1.ResourceCPU: resource.MustParse("2"),
86+
},
87+
Requests: corev1.ResourceList{
88+
corev1.ResourceMemory: resource.MustParse("2Gi"),
89+
corev1.ResourceCPU: resource.MustParse("2"),
90+
},
9591
},
9692
},
9793
},
98-
},
99-
}, &ThinValue{}},
100-
}
101-
for _, test := range tests {
102-
engine := &ThinEngine{
103-
Log: fake.NullLogger(),
104-
name: test.runtime.Name,
105-
}
106-
engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "thin", base.WithTieredStore(test.runtime.Spec.TieredStore))
107-
engine.UnitTest = true
108-
engine.transformResourcesForWorker(test.runtime.Spec.Worker.Resources, test.value)
109-
wantMemReq := test.runtime.Spec.Worker.Resources.Requests[corev1.ResourceMemory]
110-
wantCpuReq := test.runtime.Spec.Worker.Resources.Requests[corev1.ResourceCPU]
111-
wantMemLim := test.runtime.Spec.Worker.Resources.Limits[corev1.ResourceMemory]
112-
wantCpuLim := test.runtime.Spec.Worker.Resources.Limits[corev1.ResourceCPU]
113-
if len(test.runtime.Spec.Worker.Resources.Requests) != 0 &&
114-
(wantMemReq.String() != test.value.Worker.Resources.Requests[corev1.ResourceMemory] ||
115-
wantCpuReq.String() != test.value.Worker.Resources.Requests[corev1.ResourceCPU]) ||
116-
len(test.runtime.Spec.Worker.Resources.Limits) != 0 &&
117-
(wantMemLim.String() != test.value.Worker.Resources.Limits[corev1.ResourceMemory] ||
118-
wantCpuLim.String() != test.value.Worker.Resources.Limits[corev1.ResourceCPU]) {
119-
t1.Errorf("expected %v, got %v", test.runtime.Spec.Worker.Resources, test.value.Worker.Resources)
120-
}
121-
}
122-
}
94+
}
95+
value := &ThinValue{}
96+
97+
engine := &ThinEngine{
98+
Log: fake.NullLogger(),
99+
name: runtime.Name,
100+
}
101+
engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "thin", base.WithTieredStore(runtime.Spec.TieredStore))
102+
engine.UnitTest = true
103+
engine.transformResourcesForWorker(runtime.Spec.Worker.Resources, value)
104+
105+
wantMemReq := runtime.Spec.Worker.Resources.Requests[corev1.ResourceMemory]
106+
wantCpuReq := runtime.Spec.Worker.Resources.Requests[corev1.ResourceCPU]
107+
wantMemLim := runtime.Spec.Worker.Resources.Limits[corev1.ResourceMemory]
108+
wantCpuLim := runtime.Spec.Worker.Resources.Limits[corev1.ResourceCPU]
109+
110+
Expect(value.Worker.Resources.Requests[corev1.ResourceMemory]).To(Equal(wantMemReq.String()))
111+
Expect(value.Worker.Resources.Requests[corev1.ResourceCPU]).To(Equal(wantCpuReq.String()))
112+
Expect(value.Worker.Resources.Limits[corev1.ResourceMemory]).To(Equal(wantMemLim.String()))
113+
Expect(value.Worker.Resources.Limits[corev1.ResourceCPU]).To(Equal(wantCpuLim.String()))
114+
})
115+
})
116+
})

0 commit comments

Comments
 (0)