-
Notifications
You must be signed in to change notification settings - Fork 1.2k
test(dataflow): add Ginkgo/Gomega package tests #5741
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hxrshxz
wants to merge
5
commits into
fluid-cloudnative:master
Choose a base branch
from
hxrshxz:test/dataflow-ginkgo-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3587907
test(dataflow): add Ginkgo/Gomega package tests
hxrshxz 3776279
fix(dataflow): cover DataProcess error reporting
hxrshxz 5750b51
test(dataflow): deduplicate repeated test literals
hxrshxz 6b8ddb5
test(dataflow): deduplicate remaining test literals
hxrshxz 0aec248
test(dataflow): fix staticcheck error helper
hxrshxz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
204 changes: 204 additions & 0 deletions
204
pkg/controllers/v1alpha1/dataflow/dataflow_controller_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| /* | ||
| Copyright 2026 The Fluid Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package dataflow | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
|
|
||
| datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1" | ||
| "github.com/fluid-cloudnative/fluid/pkg/common" | ||
| "github.com/fluid-cloudnative/fluid/pkg/utils/fake" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/client-go/tools/record" | ||
| "k8s.io/utils/ptr" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/builder" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
| ) | ||
|
|
||
| // newTestDataFlowReconciler builds a DataFlowReconciler for unit tests. | ||
| func newTestDataFlowReconciler(s *runtime.Scheme, objs ...runtime.Object) *DataFlowReconciler { | ||
| if s == nil { | ||
| s = runtime.NewScheme() | ||
| _ = datav1alpha1.AddToScheme(s) | ||
| } | ||
| fakeClient := fake.NewFakeClientWithScheme(s, objs...) | ||
| log := logf.Log.WithName("dataflow-test") | ||
| recorder := record.NewFakeRecorder(32) | ||
| return NewDataFlowReconciler(fakeClient, log, recorder, 30*time.Second) | ||
| } | ||
|
|
||
| var _ = Describe("DataFlowReconciler", func() { | ||
|
|
||
| Describe("ControllerName", func() { | ||
| It("should return the expected controller name", func() { | ||
| r := newTestDataFlowReconciler(nil) | ||
| Expect(r.ControllerName()).To(Equal("DataFlowReconciler")) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("NewDataFlowReconciler", func() { | ||
| It("should create a non-nil reconciler with correct fields", func() { | ||
| s := runtime.NewScheme() | ||
| _ = datav1alpha1.AddToScheme(s) | ||
| r := newTestDataFlowReconciler(s) | ||
| Expect(r).NotTo(BeNil()) | ||
| Expect(r.Client).NotTo(BeNil()) | ||
| Expect(r.Recorder).NotTo(BeNil()) | ||
| Expect(r.ResyncPeriod).To(Equal(30 * time.Second)) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("Reconcile", func() { | ||
| It("should return no error and no requeue when no operation objects exist for a given name", func() { | ||
| s := runtime.NewScheme() | ||
| _ = datav1alpha1.AddToScheme(s) | ||
| r := newTestDataFlowReconciler(s) | ||
| req := ctrl.Request{ | ||
| NamespacedName: types.NamespacedName{Name: "missing", Namespace: "default"}, | ||
| } | ||
| result, err := r.Reconcile(context.TODO(), req) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(result).To(Equal(ctrl.Result{})) | ||
| }) | ||
|
|
||
| It("should requeue when a DataLoad with RunAfter exists and preceding op is not complete", func() { | ||
| s := runtime.NewScheme() | ||
| _ = datav1alpha1.AddToScheme(s) | ||
|
|
||
| precedingLoad := &datav1alpha1.DataLoad{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "preceding", Namespace: "default"}, | ||
| Status: datav1alpha1.OperationStatus{ | ||
| Phase: common.PhaseExecuting, | ||
| }, | ||
| } | ||
|
|
||
| waitingLoad := &datav1alpha1.DataLoad{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default"}, | ||
| Spec: datav1alpha1.DataLoadSpec{ | ||
| RunAfter: &datav1alpha1.OperationRef{ | ||
| ObjectRef: datav1alpha1.ObjectRef{ | ||
| Kind: "DataLoad", | ||
| Name: "preceding", | ||
| }, | ||
| }, | ||
| }, | ||
| Status: datav1alpha1.OperationStatus{ | ||
| WaitingFor: datav1alpha1.WaitingStatus{ | ||
| OperationComplete: ptr.To(true), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| r := newTestDataFlowReconciler(s, precedingLoad, waitingLoad) | ||
| req := ctrl.Request{ | ||
| NamespacedName: types.NamespacedName{Name: "test", Namespace: "default"}, | ||
| } | ||
| result, err := r.Reconcile(context.TODO(), req) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(result.RequeueAfter).To(Equal(30 * time.Second)) | ||
| }) | ||
|
|
||
| It("should not requeue when a DataLoad with RunAfter exists and preceding op is complete", func() { | ||
| s := runtime.NewScheme() | ||
| _ = datav1alpha1.AddToScheme(s) | ||
|
|
||
| precedingLoad := &datav1alpha1.DataLoad{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "preceding", Namespace: "default"}, | ||
| Status: datav1alpha1.OperationStatus{ | ||
| Phase: common.PhaseComplete, | ||
| }, | ||
| } | ||
|
Comment on lines
+127
to
+132
|
||
|
|
||
| waitingLoad := &datav1alpha1.DataLoad{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "default"}, | ||
| Spec: datav1alpha1.DataLoadSpec{ | ||
| RunAfter: &datav1alpha1.OperationRef{ | ||
| ObjectRef: datav1alpha1.ObjectRef{ | ||
| Kind: "DataLoad", | ||
| Name: "preceding", | ||
| }, | ||
| }, | ||
| }, | ||
| Status: datav1alpha1.OperationStatus{ | ||
| WaitingFor: datav1alpha1.WaitingStatus{ | ||
| OperationComplete: ptr.To(true), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| r := newTestDataFlowReconciler(s, precedingLoad, waitingLoad) | ||
| req := ctrl.Request{ | ||
| NamespacedName: types.NamespacedName{Name: "test", Namespace: "default"}, | ||
| } | ||
| result, err := r.Reconcile(context.TODO(), req) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(result).To(Equal(ctrl.Result{})) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| // DataFlowEnabled and setupWatches depend on discovery.GetFluidDiscovery() which uses a sync.Once | ||
| // singleton that requires a live cluster connection. We test the code paths that avoid touching | ||
| // the discovery singleton by temporarily substituting an empty reconcileKinds map so the loop body | ||
| // (which calls GetFluidDiscovery) is never entered. This covers the for-loop entry, toSetup | ||
| // construction, and return-false / return-bld paths without any cluster dependency. | ||
|
|
||
| var _ = Describe("DataFlowEnabled with empty reconcileKinds", func() { | ||
| var saved map[string]client.Object | ||
|
|
||
| BeforeEach(func() { | ||
| saved = reconcileKinds | ||
| reconcileKinds = map[string]client.Object{} | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| reconcileKinds = saved | ||
| }) | ||
|
|
||
| It("should return false when no resource kinds are registered", func() { | ||
| Expect(DataFlowEnabled()).To(BeFalse()) | ||
| }) | ||
| }) | ||
|
|
||
| var _ = Describe("setupWatches with empty reconcileKinds", func() { | ||
| var saved map[string]client.Object | ||
|
|
||
| BeforeEach(func() { | ||
| saved = reconcileKinds | ||
| reconcileKinds = map[string]client.Object{} | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| reconcileKinds = saved | ||
| }) | ||
|
|
||
| It("should return the builder unchanged when no resource kinds are registered", func() { | ||
| // With an empty reconcileKinds the toSetup slice stays empty, neither bld.For nor | ||
| // bld.Watches is called, and the function returns bld as-is. We pass nil as bld to | ||
| // keep the test self-contained without requiring a real controller-runtime Builder. | ||
| result := setupWatches(nil, nil, builder.Predicates{}) | ||
| Expect(result).To(BeNil()) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These tests hardcode operation phase strings (e.g. "Executing"). To avoid brittleness if phase string values change and to match the rest of the codebase, prefer using the
common.Phase*constants (as done inoperations_test.go).