Skip to content

Commit f7a7051

Browse files
committed
fix: update tests for jindocache, jindofsx, and thin to remove CacheStates assertions
1 parent c32432f commit f7a7051

3 files changed

Lines changed: 1 addition & 17 deletions

File tree

pkg/ddc/jindocache/dataset_test.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,21 +241,19 @@ var _ = Describe("Dataset", func() {
241241
})
242242

243243
DescribeTable("updating dataset phase",
244-
func(phase datav1alpha1.DatasetPhase, expectedPhase datav1alpha1.DatasetPhase, expectedCacheStates common.CacheStateList, expectedHCFSStatus *datav1alpha1.HCFSStatus) {
244+
func(phase datav1alpha1.DatasetPhase, expectedPhase datav1alpha1.DatasetPhase, expectedHCFSStatus *datav1alpha1.HCFSStatus) {
245245
err := engine.UpdateDatasetStatus(phase)
246246
Expect(err).NotTo(HaveOccurred())
247247

248248
var datasets datav1alpha1.DatasetList
249249
err = client.List(context.TODO(), &datasets)
250250
Expect(err).NotTo(HaveOccurred())
251251
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedPhase))
252-
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedCacheStates))
253252
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedHCFSStatus))
254253
},
255254
Entry("with Bound phase",
256255
datav1alpha1.BoundDatasetPhase,
257256
datav1alpha1.BoundDatasetPhase,
258-
common.CacheStateList{common.Cached: "true"},
259257
&datav1alpha1.HCFSStatus{
260258
Endpoint: "test Endpoint",
261259
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -264,7 +262,6 @@ var _ = Describe("Dataset", func() {
264262
Entry("with Failed phase",
265263
datav1alpha1.FailedDatasetPhase,
266264
datav1alpha1.FailedDatasetPhase,
267-
common.CacheStateList{common.Cached: "true"},
268265
&datav1alpha1.HCFSStatus{
269266
Endpoint: "test Endpoint",
270267
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -273,7 +270,6 @@ var _ = Describe("Dataset", func() {
273270
Entry("with None phase",
274271
datav1alpha1.NoneDatasetPhase,
275272
datav1alpha1.NoneDatasetPhase,
276-
common.CacheStateList{common.Cached: "true"},
277273
&datav1alpha1.HCFSStatus{
278274
Endpoint: "test Endpoint",
279275
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -338,9 +334,6 @@ var _ = Describe("Dataset", func() {
338334
},
339335
Status: datav1alpha1.DatasetStatus{
340336
Phase: datav1alpha1.BoundDatasetPhase,
341-
CacheStates: map[common.CacheStateName]string{
342-
common.Cached: "true",
343-
},
344337
HCFSStatus: &datav1alpha1.HCFSStatus{
345338
Endpoint: "test Endpoint",
346339
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -354,7 +347,6 @@ var _ = Describe("Dataset", func() {
354347
err = client.List(context.TODO(), &datasets)
355348
Expect(err).NotTo(HaveOccurred())
356349
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedResult.Status.Phase))
357-
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedResult.Status.CacheStates))
358350
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedResult.Status.HCFSStatus))
359351
})
360352
})

pkg/ddc/jindofsx/dataset_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
247247
err = fakeClient.List(context.TODO(), &datasets)
248248
Expect(err).NotTo(HaveOccurred())
249249
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedPhase))
250-
Expect(datasets.Items[0].Status.CacheStates).To(Equal(common.CacheStateList{
251-
common.Cached: "true",
252-
}))
253250
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(&datav1alpha1.HCFSStatus{
254251
Endpoint: "test Endpoint",
255252
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -317,9 +314,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
317314
},
318315
Status: datav1alpha1.DatasetStatus{
319316
Phase: datav1alpha1.BoundDatasetPhase,
320-
CacheStates: map[common.CacheStateName]string{
321-
common.Cached: "true",
322-
},
323317
HCFSStatus: &datav1alpha1.HCFSStatus{
324318
Endpoint: "test Endpoint",
325319
UnderlayerFileSystemVersion: "Underlayer HCFS Compatible Version",
@@ -334,7 +328,6 @@ var _ = Describe("JindoFSxEngine Dataset Operations", func() {
334328
err = client.List(context.TODO(), &datasets)
335329
Expect(err).NotTo(HaveOccurred())
336330
Expect(datasets.Items[0].Status.Phase).To(Equal(expectedResult.Status.Phase))
337-
Expect(datasets.Items[0].Status.CacheStates).To(Equal(expectedResult.Status.CacheStates))
338331
Expect(datasets.Items[0].Status.HCFSStatus).To(Equal(expectedResult.Status.HCFSStatus))
339332
})
340333
})

pkg/ddc/thin/health_check_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ var _ = Describe("ThinEngine Health Check", Label("pkg.ddc.thin.health_check_tes
218218
}
219219
Expect(hbaseDataset).NotTo(BeNil())
220220
Expect(hbaseDataset.Status.Phase).To(Equal(datav1alpha1.BoundDatasetPhase))
221-
Expect(hbaseDataset.Status.CacheStates).To(Equal(common.CacheStateList{common.Cached: "true"}))
222221
})
223222
})
224223

0 commit comments

Comments
 (0)