Skip to content

test(prefernodeswithoutcache): extract repeated expectTerm helper #5758

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.

Sign up for GitHub

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

Merged
fluid-e2e-bot merged 5 commits into from
Apr 13, 2026
+30 −43
Merged

test(prefernodeswithoutcache): extract repeated expectTerm helper #5758

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb121ea
test(prefernodeswithoutcache): extract repeated expectTerm into file-…
hxrshxz Apr 2, 2026
ebdc444
test(prefernodeswithoutcache): assert mutate injects preferred term
hxrshxz Apr 6, 2026
6730def
test(prefernodeswithoutcache): assert non-mutating mutate paths
hxrshxz Apr 6, 2026
5ce1af8
test(prefernodeswithoutcache): remove dead selector setup
hxrshxz Apr 6, 2026
2882049
test(prefernodeswithoutcache): drop redundant getter spec
hxrshxz Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 30 additions & 43 deletions pkg/webhook/plugins/prefernodeswithoutcache/prefer_nodes_without_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,52 +26,30 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

// expectedNoDatasetTerm is the canonical PreferredSchedulingTerm asserted across
// multiple specs for getPreferredSchedulingTermForPodWithoutCache.
func expectedNoDatasetTerm() corev1.PreferredSchedulingTerm {
return corev1.PreferredSchedulingTerm{
Weight: 100,
Preference: corev1.NodeSelectorTerm{
MatchExpressions: []corev1.NodeSelectorRequirement{
{
Key: common.GetDatasetNumLabelName(),
Operator: corev1.NodeSelectorOpDoesNotExist,
},
},
},
}
}
Comment thread
hxrshxz marked this conversation as resolved.

var _ = Describe("PreferNodesWithoutCache Plugin", func() {
Describe("getPreferredSchedulingTermForPodWithoutCache", func() {
It("should return correct PreferredSchedulingTerm with selector enabled and disabled", func() {
runtimeInfo, err := base.BuildRuntimeInfo("test", "fluid", "alluxio")
Expect(err).NotTo(HaveOccurred())

runtimeInfo.SetFuseNodeSelector(map[string]string{"test1": "test1"})
It("should return the same PreferredSchedulingTerm on repeated calls", func() {
term := getPreferredSchedulingTermForPodWithoutCache()
Expect(term).To(Equal(expectedNoDatasetTerm()))
Comment thread
hxrshxz marked this conversation as resolved.

expectTerm := corev1.PreferredSchedulingTerm{
Weight: 100,
Preference: corev1.NodeSelectorTerm{
MatchExpressions: []corev1.NodeSelectorRequirement{
{
Key: common.GetDatasetNumLabelName(),
Operator: corev1.NodeSelectorOpDoesNotExist,
},
},
},
}
Expect(term).To(Equal(expectTerm))

runtimeInfo.SetFuseNodeSelector(map[string]string{})
term = getPreferredSchedulingTermForPodWithoutCache()
Expect(term).To(Equal(expectTerm))
})

It("should return correct PreferredSchedulingTerm with default mode", func() {
runtimeInfo, err := base.BuildRuntimeInfo("test", "fluid", "alluxio")
Expect(err).NotTo(HaveOccurred())

runtimeInfo.SetFuseNodeSelector(map[string]string{})
term := getPreferredSchedulingTermForPodWithoutCache()

expectTerm := corev1.PreferredSchedulingTerm{
Weight: 100,
Preference: corev1.NodeSelectorTerm{
MatchExpressions: []corev1.NodeSelectorRequirement{
{
Key: common.GetDatasetNumLabelName(),
Operator: corev1.NodeSelectorOpDoesNotExist,
},
},
},
}
Expect(term).To(Equal(expectTerm))
Expect(term).To(Equal(expectedNoDatasetTerm()))
})
})

Expand Down Expand Up @@ -102,12 +80,21 @@ var _ = Describe("PreferNodesWithoutCache Plugin", func() {
shouldStop, err := plugin.Mutate(pod, map[string]base.RuntimeInfoInterface{"test": runtimeInfo})
Expect(err).NotTo(HaveOccurred())
Expect(shouldStop).To(BeTrue())
Expect(pod.Spec.Affinity).To(BeNil())

_, err = plugin.Mutate(pod, map[string]base.RuntimeInfoInterface{})
shouldStop, err = plugin.Mutate(pod, map[string]base.RuntimeInfoInterface{})
Expect(err).NotTo(HaveOccurred())
Expect(shouldStop).To(BeTrue())
Expect(pod.Spec.Affinity).NotTo(BeNil())
Expect(pod.Spec.Affinity.NodeAffinity).NotTo(BeNil())
Expect(pod.Spec.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution).To(Equal([]corev1.PreferredSchedulingTerm{expectedNoDatasetTerm()}))
Comment thread
hxrshxz marked this conversation as resolved.

_, err = plugin.Mutate(pod, map[string]base.RuntimeInfoInterface{"test": nil})
pod.Spec.Affinity = nil

shouldStop, err = plugin.Mutate(pod, map[string]base.RuntimeInfoInterface{"test": nil})
Expect(err).NotTo(HaveOccurred())
Expect(shouldStop).To(BeTrue())
Expect(pod.Spec.Affinity).To(BeNil())
})
})
})
Loading