Skip to content

Commit d2aff7a

Browse files
hxrshxzhxrshxz
authored
test(jindofsx): migrate status_test.go to Ginkgo/Gomega (#5626)
Signed-off-by: Harsh <harshmastic@gmail.com>
1 parent bdf137d commit d2aff7a

File tree

1 file changed

+147
-155
lines changed

1 file changed

+147
-155
lines changed

‎pkg/ddc/jindofsx/status_test.go‎

Lines changed: 147 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -17,178 +17,170 @@ limitations under the License.
1717
package jindofsx
1818

1919
import (
20-
"testing"
21-
2220
datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
2321
"github.com/fluid-cloudnative/fluid/pkg/utils"
2422
"github.com/fluid-cloudnative/fluid/pkg/utils/fake"
23+
. "github.com/onsi/ginkgo/v2"
2524
appsv1 "k8s.io/api/apps/v1"
2625
v1 "k8s.io/api/core/v1"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"k8s.io/apimachinery/pkg/runtime"
2928
)
3029

31-
func TestCheckAndUpdateRuntimeStatus(t *testing.T) {
32-
33-
masterInputs := []*appsv1.StatefulSet{
34-
{
35-
ObjectMeta: metav1.ObjectMeta{
36-
Name: "hadoop-master",
37-
Namespace: "fluid",
38-
},
39-
Status: appsv1.StatefulSetStatus{
40-
ReadyReplicas: 0,
41-
},
42-
},
43-
{
44-
ObjectMeta: metav1.ObjectMeta{
45-
Name: "hbase-master",
46-
Namespace: "fluid",
47-
},
48-
Status: appsv1.StatefulSetStatus{
49-
ReadyReplicas: 1,
30+
var _ = Describe("CheckAndUpdateRuntimeStatus", func() {
31+
var (
32+
masterInputs []*appsv1.StatefulSet
33+
workerInputs []appsv1.StatefulSet
34+
runtimeInputs []*datav1alpha1.JindoRuntime
35+
)
36+
37+
BeforeEach(func() {
38+
masterInputs = []*appsv1.StatefulSet{
39+
{
40+
ObjectMeta: metav1.ObjectMeta{
41+
Name: "hadoop-master",
42+
Namespace: "fluid",
43+
},
44+
Status: appsv1.StatefulSetStatus{
45+
ReadyReplicas: 0,
46+
},
5047
},
51-
}, {
52-
ObjectMeta: metav1.ObjectMeta{
53-
Name: "deprecated-jindofs-master",
54-
Namespace: "fluid",
48+
{
49+
ObjectMeta: metav1.ObjectMeta{
50+
Name: "hbase-master",
51+
Namespace: "fluid",
52+
},
53+
Status: appsv1.StatefulSetStatus{
54+
ReadyReplicas: 1,
55+
},
5556
},
56-
Status: appsv1.StatefulSetStatus{
57-
ReadyReplicas: 1,
57+
{
58+
ObjectMeta: metav1.ObjectMeta{
59+
Name: "deprecated-jindofs-master",
60+
Namespace: "fluid",
61+
},
62+
Status: appsv1.StatefulSetStatus{
63+
ReadyReplicas: 1,
64+
},
5865
},
59-
},
60-
}
66+
}
6167

62-
var workerInputs = []appsv1.StatefulSet{
63-
{
64-
ObjectMeta: metav1.ObjectMeta{
65-
Name: "hbase-worker",
66-
Namespace: "fluid",
67-
},
68-
Status: appsv1.StatefulSetStatus{
69-
Replicas: 3,
70-
ReadyReplicas: 3,
68+
workerInputs = []appsv1.StatefulSet{
69+
{
70+
ObjectMeta: metav1.ObjectMeta{
71+
Name: "hbase-worker",
72+
Namespace: "fluid",
73+
},
74+
Status: appsv1.StatefulSetStatus{
75+
Replicas: 3,
76+
ReadyReplicas: 3,
77+
},
7178
},
72-
},
73-
}
79+
}
7480

75-
runtimeInputs := []*datav1alpha1.JindoRuntime{
76-
{
77-
ObjectMeta: metav1.ObjectMeta{
78-
Name: "hbase",
79-
Namespace: "fluid",
80-
},
81-
Spec: datav1alpha1.JindoRuntimeSpec{
82-
Replicas: 3, // 2
83-
},
84-
Status: datav1alpha1.RuntimeStatus{
85-
CurrentWorkerNumberScheduled: 2,
86-
CurrentMasterNumberScheduled: 2, // 0
87-
CurrentFuseNumberScheduled: 2,
88-
DesiredMasterNumberScheduled: 3,
89-
DesiredWorkerNumberScheduled: 2,
90-
DesiredFuseNumberScheduled: 3,
91-
Conditions: []datav1alpha1.RuntimeCondition{
92-
utils.NewRuntimeCondition(datav1alpha1.RuntimeWorkersInitialized, datav1alpha1.RuntimeWorkersInitializedReason, "The workers are initialized.", v1.ConditionTrue),
93-
utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason, "The fuses are initialized.", v1.ConditionTrue),
94-
},
95-
WorkerPhase: "NotReady",
96-
FusePhase: "NotReady",
97-
},
98-
},
99-
{
100-
ObjectMeta: metav1.ObjectMeta{
101-
Name: "hadoop",
102-
Namespace: "fluid",
103-
},
104-
Spec: datav1alpha1.JindoRuntimeSpec{
105-
Replicas: 2,
106-
},
107-
Status: datav1alpha1.RuntimeStatus{
108-
CurrentWorkerNumberScheduled: 3,
109-
CurrentMasterNumberScheduled: 3,
110-
CurrentFuseNumberScheduled: 3,
111-
DesiredMasterNumberScheduled: 2,
112-
DesiredWorkerNumberScheduled: 3,
113-
DesiredFuseNumberScheduled: 2,
114-
Conditions: []datav1alpha1.RuntimeCondition{
115-
utils.NewRuntimeCondition(datav1alpha1.RuntimeWorkersInitialized, datav1alpha1.RuntimeWorkersInitializedReason, "The workers are initialized.", v1.ConditionTrue),
116-
utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason, "The fuses are initialized.", v1.ConditionTrue),
117-
},
118-
WorkerPhase: "NotReady",
119-
FusePhase: "NotReady",
120-
},
121-
},
122-
{
123-
ObjectMeta: metav1.ObjectMeta{
124-
Name: "obj",
125-
Namespace: "fluid",
126-
},
127-
Spec: datav1alpha1.JindoRuntimeSpec{
128-
Replicas: 2,
129-
},
130-
Status: datav1alpha1.RuntimeStatus{
131-
CurrentWorkerNumberScheduled: 2,
132-
CurrentMasterNumberScheduled: 2,
133-
CurrentFuseNumberScheduled: 2,
134-
DesiredMasterNumberScheduled: 2,
135-
DesiredWorkerNumberScheduled: 2,
136-
DesiredFuseNumberScheduled: 2,
137-
WorkerPhase: "NotReady",
138-
FusePhase: "NotReady",
81+
runtimeInputs = []*datav1alpha1.JindoRuntime{
82+
{
83+
ObjectMeta: metav1.ObjectMeta{
84+
Name: "hbase",
85+
Namespace: "fluid",
86+
},
87+
Spec: datav1alpha1.JindoRuntimeSpec{
88+
Replicas: 3,
89+
},
90+
Status: datav1alpha1.RuntimeStatus{
91+
CurrentWorkerNumberScheduled: 2,
92+
CurrentMasterNumberScheduled: 2,
93+
CurrentFuseNumberScheduled: 2,
94+
DesiredMasterNumberScheduled: 3,
95+
DesiredWorkerNumberScheduled: 2,
96+
DesiredFuseNumberScheduled: 3,
97+
Conditions: []datav1alpha1.RuntimeCondition{
98+
utils.NewRuntimeCondition(datav1alpha1.RuntimeWorkersInitialized, datav1alpha1.RuntimeWorkersInitializedReason, "The workers are initialized.", v1.ConditionTrue),
99+
utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason, "The fuses are initialized.", v1.ConditionTrue),
100+
},
101+
WorkerPhase: "NotReady",
102+
FusePhase: "NotReady",
103+
},
139104
},
140-
}, {
141-
ObjectMeta: metav1.ObjectMeta{
142-
Name: "deprecated",
143-
Namespace: "fluid",
105+
{
106+
ObjectMeta: metav1.ObjectMeta{
107+
Name: "hadoop",
108+
Namespace: "fluid",
109+
},
110+
Spec: datav1alpha1.JindoRuntimeSpec{
111+
Replicas: 2,
112+
},
113+
Status: datav1alpha1.RuntimeStatus{
114+
CurrentWorkerNumberScheduled: 3,
115+
CurrentMasterNumberScheduled: 3,
116+
CurrentFuseNumberScheduled: 3,
117+
DesiredMasterNumberScheduled: 2,
118+
DesiredWorkerNumberScheduled: 3,
119+
DesiredFuseNumberScheduled: 2,
120+
Conditions: []datav1alpha1.RuntimeCondition{
121+
utils.NewRuntimeCondition(datav1alpha1.RuntimeWorkersInitialized, datav1alpha1.RuntimeWorkersInitializedReason, "The workers are initialized.", v1.ConditionTrue),
122+
utils.NewRuntimeCondition(datav1alpha1.RuntimeFusesInitialized, datav1alpha1.RuntimeFusesInitializedReason, "The fuses are initialized.", v1.ConditionTrue),
123+
},
124+
WorkerPhase: "NotReady",
125+
FusePhase: "NotReady",
126+
},
144127
},
145-
Spec: datav1alpha1.JindoRuntimeSpec{
146-
Replicas: 2,
128+
{
129+
ObjectMeta: metav1.ObjectMeta{
130+
Name: "obj",
131+
Namespace: "fluid",
132+
},
133+
Spec: datav1alpha1.JindoRuntimeSpec{
134+
Replicas: 2,
135+
},
136+
Status: datav1alpha1.RuntimeStatus{
137+
CurrentWorkerNumberScheduled: 2,
138+
CurrentMasterNumberScheduled: 2,
139+
CurrentFuseNumberScheduled: 2,
140+
DesiredMasterNumberScheduled: 2,
141+
DesiredWorkerNumberScheduled: 2,
142+
DesiredFuseNumberScheduled: 2,
143+
WorkerPhase: "NotReady",
144+
FusePhase: "NotReady",
145+
},
147146
},
148-
Status: datav1alpha1.RuntimeStatus{
149-
CurrentWorkerNumberScheduled: 2,
150-
CurrentMasterNumberScheduled: 2,
151-
CurrentFuseNumberScheduled: 2,
152-
DesiredMasterNumberScheduled: 2,
153-
DesiredWorkerNumberScheduled: 2,
154-
DesiredFuseNumberScheduled: 2,
155-
WorkerPhase: "NotReady",
156-
FusePhase: "NotReady",
147+
{
148+
ObjectMeta: metav1.ObjectMeta{
149+
Name: "deprecated",
150+
Namespace: "fluid",
151+
},
152+
Spec: datav1alpha1.JindoRuntimeSpec{
153+
Replicas: 2,
154+
},
155+
Status: datav1alpha1.RuntimeStatus{
156+
CurrentWorkerNumberScheduled: 2,
157+
CurrentMasterNumberScheduled: 2,
158+
CurrentFuseNumberScheduled: 2,
159+
DesiredMasterNumberScheduled: 2,
160+
DesiredWorkerNumberScheduled: 2,
161+
DesiredFuseNumberScheduled: 2,
162+
WorkerPhase: "NotReady",
163+
FusePhase: "NotReady",
164+
},
157165
},
158-
},
159-
}
160-
161-
objs := []runtime.Object{}
162-
for _, masterInput := range masterInputs {
163-
objs = append(objs, masterInput.DeepCopy())
164-
}
165-
166-
for _, workerInput := range workerInputs {
167-
objs = append(objs, workerInput.DeepCopy())
168-
}
169-
170-
for _, runtimeInput := range runtimeInputs {
171-
objs = append(objs, runtimeInput.DeepCopy())
172-
}
173-
fakeClient := fake.NewFakeClientWithScheme(testScheme, objs...)
174-
// engine := newJindoFSxEngineREP(fakeClient, testCase.name, testCase.namespace)
175-
176-
testCases := []struct {
177-
testName string
178-
name string
179-
namespace string
180-
isErr bool
181-
deprecated bool
182-
}{
183-
// Removed deprecated test case
184-
}
185-
186-
for _, testCase := range testCases {
187-
engine := newJindoFSxEngineREP(fakeClient, testCase.name, testCase.namespace)
188-
189-
_, err := engine.CheckAndUpdateRuntimeStatus()
190-
if err != nil {
191-
t.Errorf("testcase %s Failed due to %v", testCase.testName, err)
192166
}
193-
}
194-
}
167+
})
168+
169+
Context("with test fixtures setup", func() {
170+
It("should have proper test data initialized", func() {
171+
objs := []runtime.Object{}
172+
for _, masterInput := range masterInputs {
173+
objs = append(objs, masterInput.DeepCopy())
174+
}
175+
176+
for _, workerInput := range workerInputs {
177+
objs = append(objs, workerInput.DeepCopy())
178+
}
179+
180+
for _, runtimeInput := range runtimeInputs {
181+
objs = append(objs, runtimeInput.DeepCopy())
182+
}
183+
_ = fake.NewFakeClientWithScheme(testScheme, objs...)
184+
})
185+
})
186+
})

0 commit comments

Comments
 (0)