Skip to content

Commit 11f1f15

Browse files
AMeceacalind
authored andcommitted
Add test for runtime error
1 parent 130f5cc commit 11f1f15

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

pkg/apis/mysql/v1alpha1/mysqlcluster_defaults.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ var (
3131
resourceRequestMemory = resource.MustParse("1Gi")
3232
)
3333

34-
// SetDefaults_MysqlCluster sets the defaults for a mysqlcluster object
34+
var (
35+
one int32 = 1
36+
)
37+
38+
// SetDefaults_MysqlCluster sets the defaults for a MySQLCLuster object
3539
// nolint
3640
func SetDefaults_MysqlCluster(c *MysqlCluster) {
3741

@@ -42,7 +46,6 @@ func SetDefaults_MysqlCluster(c *MysqlCluster) {
4246
}
4347

4448
if c.Spec.Replicas == nil {
45-
one := int32(1)
4649
c.Spec.Replicas = &one
4750
}
4851

@@ -53,7 +56,6 @@ func SetDefaults_MysqlCluster(c *MysqlCluster) {
5356
if len(c.Spec.MinAvailable) == 0 && *c.Spec.Replicas > 1 {
5457
c.Spec.MinAvailable = defaultMinAvailable
5558
}
56-
5759
}
5860

5961
// SetDefaults for PodSpec
@@ -66,7 +68,6 @@ func (c *MysqlCluster) setPodSpecDefaults(spec *PodSpec) {
6668
},
6769
}
6870
}
69-
7071
}
7172

7273
// SetDefaults for VolumeSpec

pkg/apis/mysql/v1alpha1/mysqlcluster_types_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1alpha1
1919

2020
import (
2121
"context"
22-
2322
. "github.com/onsi/ginkgo"
2423
. "github.com/onsi/gomega"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -71,12 +70,20 @@ var _ = Describe("MysqlCluster CRUD", func() {
7170
})
7271
})
7372

74-
Context("defaulting functions", func() {
73+
Context("defaulting functions on MySQLCluster", func() {
74+
var (
75+
cluster *MysqlCluster
76+
)
77+
78+
BeforeEach(func() {
79+
cluster = &MysqlCluster{ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "default"}}
80+
})
81+
7582
It("should populate fields defaults", func() {
76-
cluster := &MysqlCluster{ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "default"}}
7783
SetDefaults_MysqlCluster(cluster)
7884

7985
Expect(cluster.Spec.MysqlConf).NotTo(BeNil())
8086
})
8187
})
88+
8289
})

pkg/controller/mysqlcluster/mysqlcluster_controller_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ var _ = Describe("MysqlCluster controller", func() {
5959
stop chan struct{}
6060
// controller k8s client
6161
c client.Client
62+
// k8s runtime scheme
63+
scheme *runtime.Scheme
6264
)
6365

6466
BeforeEach(func() {
@@ -67,6 +69,7 @@ var _ = Describe("MysqlCluster controller", func() {
6769
mgr, err := manager.New(cfg, manager.Options{})
6870
Expect(err).NotTo(HaveOccurred())
6971
c = mgr.GetClient()
72+
scheme = mgr.GetScheme()
7073

7174
recFn, requests = testutil.SetupTestReconcile(newReconciler(mgr))
7275
Expect(add(mgr, recFn)).To(Succeed())
@@ -375,6 +378,7 @@ var _ = Describe("MysqlCluster controller", func() {
375378

376379
Expect(s.OwnerReferences).To(HaveLen(0), "should have no owner reference set")
377380
})
381+
378382
})
379383
})
380384

@@ -449,6 +453,13 @@ var _ = Describe("MysqlCluster controller", func() {
449453
})
450454

451455
})
456+
Context("testing defaults", func() {
457+
It("should set the defaults", func() {
458+
newCl := &api.MysqlCluster{}
459+
scheme.Default(newCl)
460+
Expect(newCl.Spec.Replicas).To(PointTo(Equal(int32(1))))
461+
})
462+
})
452463
})
453464

454465
func removeAllCreatedResource(c client.Client, clusterComps []runtime.Object) {

pkg/controller/orchestrator/orchestrator_controller_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ var _ = Describe("Orchestrator controller", func() {
119119
Namespace: clusterKey.Namespace,
120120
},
121121
Spec: api.MysqlClusterSpec{
122-
Replicas: &one,
122+
// use .replicas as nil for testing propose
123+
// Replicas: &one,
123124
SecretName: secret.Name,
124125
},
125126
})

0 commit comments

Comments
 (0)