Skip to content

Commit 546c003

Browse files
committed
Remove unnecessary test setup in sts unit tests
- we do not need to create a new sts builder in each test spec
1 parent 8046c84 commit 546c003

File tree

1 file changed

+13
-31
lines changed

1 file changed

+13
-31
lines changed

internal/resource/statefulset_test.go

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ import (
2525

2626
var _ = Describe("StatefulSet", func() {
2727
var (
28-
instance rabbitmqv1beta1.RabbitmqCluster
29-
scheme *runtime.Scheme
30-
cluster *resource.RabbitmqResourceBuilder
28+
instance rabbitmqv1beta1.RabbitmqCluster
29+
scheme *runtime.Scheme
30+
cluster *resource.RabbitmqResourceBuilder
31+
stsBuilder *resource.StatefulSetBuilder
3132
)
3233

3334
Context("Build", func() {
@@ -41,10 +42,10 @@ var _ = Describe("StatefulSet", func() {
4142
Instance: &instance,
4243
Scheme: scheme,
4344
}
45+
stsBuilder = cluster.StatefulSet()
4446
})
4547

4648
It("sets the name and namespace", func() {
47-
stsBuilder := cluster.StatefulSet()
4849
obj, err := stsBuilder.Build()
4950
Expect(err).NotTo(HaveOccurred())
5051
sts := obj.(*appsv1.StatefulSet)
@@ -54,15 +55,13 @@ var _ = Describe("StatefulSet", func() {
5455
})
5556

5657
It("sets the right service name", func() {
57-
stsBuilder := cluster.StatefulSet()
5858
obj, err := stsBuilder.Build()
5959
Expect(err).NotTo(HaveOccurred())
6060
statefulSet := obj.(*appsv1.StatefulSet)
6161

6262
Expect(statefulSet.Spec.ServiceName).To(Equal(instance.ChildResourceName("headless")))
6363
})
6464
It("adds the correct label selector", func() {
65-
stsBuilder := cluster.StatefulSet()
6665
obj, err := stsBuilder.Build()
6766
Expect(err).NotTo(HaveOccurred())
6867
statefulSet := obj.(*appsv1.StatefulSet)
@@ -73,12 +72,8 @@ var _ = Describe("StatefulSet", func() {
7372

7473
It("references the storageclassname when specified", func() {
7574
storageClassName := "my-storage-class"
76-
instance.Spec.Persistence.StorageClassName = &storageClassName
77-
cluster = &resource.RabbitmqResourceBuilder{
78-
Instance: &instance,
79-
Scheme: scheme,
80-
}
81-
stsBuilder := cluster.StatefulSet()
75+
cluster.Instance.Spec.Persistence.StorageClassName = &storageClassName
76+
8277
obj, err := stsBuilder.Build()
8378
Expect(err).NotTo(HaveOccurred())
8479
statefulSet := obj.(*appsv1.StatefulSet)
@@ -88,12 +83,8 @@ var _ = Describe("StatefulSet", func() {
8883

8984
It("creates the PersistentVolume template according to configurations in the instance", func() {
9085
storage := k8sresource.MustParse("21Gi")
91-
instance.Spec.Persistence.Storage = &storage
92-
cluster = &resource.RabbitmqResourceBuilder{
93-
Instance: &instance,
94-
Scheme: scheme,
95-
}
96-
stsBuilder := cluster.StatefulSet()
86+
cluster.Instance.Spec.Persistence.Storage = &storage
87+
9788
obj, err := stsBuilder.Build()
9889
Expect(err).NotTo(HaveOccurred())
9990
statefulSet := obj.(*appsv1.StatefulSet)
@@ -106,7 +97,6 @@ var _ = Describe("StatefulSet", func() {
10697
truth := true
10798
q, _ := k8sresource.ParseQuantity("10Gi")
10899

109-
stsBuilder := cluster.StatefulSet()
110100
obj, err := stsBuilder.Build()
111101
Expect(err).NotTo(HaveOccurred())
112102
statefulSet := obj.(*appsv1.StatefulSet)
@@ -148,7 +138,7 @@ var _ = Describe("StatefulSet", func() {
148138
})
149139
Context("Override", func() {
150140
It("overrides statefulSet.spec.selector", func() {
151-
instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
141+
cluster.Instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
152142
Spec: &rabbitmqv1beta1.StatefulSetSpec{
153143
Selector: &metav1.LabelSelector{
154144
MatchLabels: map[string]string{
@@ -158,21 +148,19 @@ var _ = Describe("StatefulSet", func() {
158148
},
159149
}
160150

161-
stsBuilder := cluster.StatefulSet()
162151
obj, err := stsBuilder.Build()
163152
Expect(err).NotTo(HaveOccurred())
164153
statefulSet := obj.(*appsv1.StatefulSet)
165154
Expect(statefulSet.Spec.Selector.MatchLabels).To(Equal(map[string]string{"my-label": "my-label"}))
166155
})
167156

168157
It("overrides statefulSet.spec.serviceName", func() {
169-
instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
158+
cluster.Instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
170159
Spec: &rabbitmqv1beta1.StatefulSetSpec{
171160
ServiceName: "mysevice",
172161
},
173162
}
174163

175-
stsBuilder := cluster.StatefulSet()
176164
obj, err := stsBuilder.Build()
177165
Expect(err).NotTo(HaveOccurred())
178166
statefulSet := obj.(*appsv1.StatefulSet)
@@ -182,7 +170,7 @@ var _ = Describe("StatefulSet", func() {
182170
It("overrides the PVC list", func() {
183171
storageClass := "my-storage-class"
184172
truth := true
185-
instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
173+
cluster.Instance.Spec.Override.StatefulSet = &rabbitmqv1beta1.StatefulSet{
186174
Spec: &rabbitmqv1beta1.StatefulSetSpec{
187175
VolumeClaimTemplates: []rabbitmqv1beta1.PersistentVolumeClaim{
188176
{
@@ -216,10 +204,6 @@ var _ = Describe("StatefulSet", func() {
216204
},
217205
},
218206
}
219-
cluster = &resource.RabbitmqResourceBuilder{
220-
Instance: &instance,
221-
Scheme: scheme,
222-
}
223207
stsBuilder := cluster.StatefulSet()
224208
obj, err := stsBuilder.Build()
225209
Expect(err).NotTo(HaveOccurred())
@@ -283,12 +267,10 @@ var _ = Describe("StatefulSet", func() {
283267
var (
284268
statefulSet *appsv1.StatefulSet
285269
stsBuilder *resource.StatefulSetBuilder
286-
affinity *corev1.Affinity
287270
)
288271

289272
BeforeEach(func() {
290273
instance = generateRabbitmqCluster()
291-
292274
scheme = runtime.NewScheme()
293275
Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
294276
Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
@@ -309,7 +291,7 @@ var _ = Describe("StatefulSet", func() {
309291
})
310292

311293
It("creates the affinity rule as provided in the instance", func() {
312-
affinity = &corev1.Affinity{
294+
affinity := &corev1.Affinity{
313295
NodeAffinity: &corev1.NodeAffinity{
314296
RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
315297
NodeSelectorTerms: []corev1.NodeSelectorTerm{

0 commit comments

Comments
 (0)