Skip to content

Commit 8eb2010

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #599 from Samze/pr-gomega-tests
Use idiomatic gomega syntax in generated tests
2 parents d32b374 + 1ad5081 commit 8eb2010

File tree

11 files changed

+38
-38
lines changed

11 files changed

+38
-38
lines changed

‎pkg/scaffold/controller/controllertest.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func TestReconcile(t *testing.T) {
106106
c = mgr.GetClient()
107107
108108
recFn, requests := SetupTestReconcile(newReconciler(mgr))
109-
g.Expect(add(mgr, recFn)).NotTo(gomega.HaveOccurred())
109+
g.Expect(add(mgr, recFn)).To(gomega.Succeed())
110110
111111
stopMgr, mgrStopped := StartTestManager(mgr, g)
112112
@@ -132,7 +132,7 @@ func TestReconcile(t *testing.T) {
132132
Should(gomega.Succeed())
133133
134134
// Delete the Deployment and expect Reconcile to be called for Deployment deletion
135-
g.Expect(c.Delete(context.TODO(), deploy)).NotTo(gomega.HaveOccurred())
135+
g.Expect(c.Delete(context.TODO(), deploy)).To(gomega.Succeed())
136136
g.Eventually(requests, timeout).Should(gomega.Receive(gomega.Equal(expectedRequest)))
137137
g.Eventually(func() error { return c.Get(context.TODO(), depKey, deploy) }, timeout).
138138
Should(gomega.Succeed())

‎pkg/scaffold/resource/typestest.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ func TestStorage{{ .Resource.Kind }}(t *testing.T) {
8181
8282
// Test Create
8383
fetched := &{{ .Resource.Kind }}{}
84-
g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
84+
g.Expect(c.Create(context.TODO(), created)).To(gomega.Succeed())
8585
86-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
86+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
8787
g.Expect(fetched).To(gomega.Equal(created))
8888
8989
// Test Updating the Labels
9090
updated := fetched.DeepCopy()
9191
updated.Labels = map[string]string{"hello": "world"}
92-
g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
92+
g.Expect(c.Update(context.TODO(), updated)).To(gomega.Succeed())
9393
94-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
94+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
9595
g.Expect(fetched).To(gomega.Equal(updated))
9696
9797
// Test Delete
98-
g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
99-
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
98+
g.Expect(c.Delete(context.TODO(), fetched)).To(gomega.Succeed())
99+
g.Expect(c.Get(context.TODO(), key, fetched)).ToNot(gomega.Succeed())
100100
}
101101
`

‎test/project/pkg/apis/creatures/v2alpha1/kraken_types_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ func TestStorageKraken(t *testing.T) {
3737

3838
// Test Create
3939
fetched := &Kraken{}
40-
g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
40+
g.Expect(c.Create(context.TODO(), created)).To(gomega.Succeed())
4141

42-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
42+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
4343
g.Expect(fetched).To(gomega.Equal(created))
4444

4545
// Test Updating the Labels
4646
updated := fetched.DeepCopy()
4747
updated.Labels = map[string]string{"hello": "world"}
48-
g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
48+
g.Expect(c.Update(context.TODO(), updated)).To(gomega.Succeed())
4949

50-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
50+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
5151
g.Expect(fetched).To(gomega.Equal(updated))
5252

5353
// Test Delete
54-
g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
55-
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
54+
g.Expect(c.Delete(context.TODO(), fetched)).To(gomega.Succeed())
55+
g.Expect(c.Get(context.TODO(), key, fetched)).ToNot(gomega.Succeed())
5656
}

‎test/project/pkg/apis/crew/v1/firstmate_types_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ func TestStorageFirstMate(t *testing.T) {
3939

4040
// Test Create
4141
fetched := &FirstMate{}
42-
g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
42+
g.Expect(c.Create(context.TODO(), created)).To(gomega.Succeed())
4343

44-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
44+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
4545
g.Expect(fetched).To(gomega.Equal(created))
4646

4747
// Test Updating the Labels
4848
updated := fetched.DeepCopy()
4949
updated.Labels = map[string]string{"hello": "world"}
50-
g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
50+
g.Expect(c.Update(context.TODO(), updated)).To(gomega.Succeed())
5151

52-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
52+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
5353
g.Expect(fetched).To(gomega.Equal(updated))
5454

5555
// Test Delete
56-
g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
57-
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
56+
g.Expect(c.Delete(context.TODO(), fetched)).To(gomega.Succeed())
57+
g.Expect(c.Get(context.TODO(), key, fetched)).ToNot(gomega.Succeed())
5858
}

‎test/project/pkg/apis/policy/v1beta1/healthcheckpolicy_types_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ func TestStorageHealthCheckPolicy(t *testing.T) {
3737

3838
// Test Create
3939
fetched := &HealthCheckPolicy{}
40-
g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
40+
g.Expect(c.Create(context.TODO(), created)).To(gomega.Succeed())
4141

42-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
42+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
4343
g.Expect(fetched).To(gomega.Equal(created))
4444

4545
// Test Updating the Labels
4646
updated := fetched.DeepCopy()
4747
updated.Labels = map[string]string{"hello": "world"}
48-
g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
48+
g.Expect(c.Update(context.TODO(), updated)).To(gomega.Succeed())
4949

50-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
50+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
5151
g.Expect(fetched).To(gomega.Equal(updated))
5252

5353
// Test Delete
54-
g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
55-
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
54+
g.Expect(c.Delete(context.TODO(), fetched)).To(gomega.Succeed())
55+
g.Expect(c.Get(context.TODO(), key, fetched)).ToNot(gomega.Succeed())
5656
}

‎test/project/pkg/apis/ship/v1beta1/frigate_types_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ func TestStorageFrigate(t *testing.T) {
3939

4040
// Test Create
4141
fetched := &Frigate{}
42-
g.Expect(c.Create(context.TODO(), created)).NotTo(gomega.HaveOccurred())
42+
g.Expect(c.Create(context.TODO(), created)).To(gomega.Succeed())
4343

44-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
44+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
4545
g.Expect(fetched).To(gomega.Equal(created))
4646

4747
// Test Updating the Labels
4848
updated := fetched.DeepCopy()
4949
updated.Labels = map[string]string{"hello": "world"}
50-
g.Expect(c.Update(context.TODO(), updated)).NotTo(gomega.HaveOccurred())
50+
g.Expect(c.Update(context.TODO(), updated)).To(gomega.Succeed())
5151

52-
g.Expect(c.Get(context.TODO(), key, fetched)).NotTo(gomega.HaveOccurred())
52+
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.Succeed())
5353
g.Expect(fetched).To(gomega.Equal(updated))
5454

5555
// Test Delete
56-
g.Expect(c.Delete(context.TODO(), fetched)).NotTo(gomega.HaveOccurred())
57-
g.Expect(c.Get(context.TODO(), key, fetched)).To(gomega.HaveOccurred())
56+
g.Expect(c.Delete(context.TODO(), fetched)).To(gomega.Succeed())
57+
g.Expect(c.Get(context.TODO(), key, fetched)).ToNot(gomega.Succeed())
5858
}

‎test/project/pkg/controller/firstmate/firstmate_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestReconcile(t *testing.T) {
5050
c = mgr.GetClient()
5151

5252
recFn, requests := SetupTestReconcile(newReconciler(mgr))
53-
g.Expect(add(mgr, recFn)).NotTo(gomega.HaveOccurred())
53+
g.Expect(add(mgr, recFn)).To(gomega.Succeed())
5454

5555
stopMgr, mgrStopped := StartTestManager(mgr, g)
5656

@@ -76,7 +76,7 @@ func TestReconcile(t *testing.T) {
7676
Should(gomega.Succeed())
7777

7878
// Delete the Deployment and expect Reconcile to be called for Deployment deletion
79-
g.Expect(c.Delete(context.TODO(), deploy)).NotTo(gomega.HaveOccurred())
79+
g.Expect(c.Delete(context.TODO(), deploy)).To(gomega.Succeed())
8080
g.Eventually(requests, timeout).Should(gomega.Receive(gomega.Equal(expectedRequest)))
8181
g.Eventually(func() error { return c.Get(context.TODO(), depKey, deploy) }, timeout).
8282
Should(gomega.Succeed())

‎test/project/pkg/controller/frigate/frigate_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestReconcile(t *testing.T) {
4848
c = mgr.GetClient()
4949

5050
recFn, requests := SetupTestReconcile(newReconciler(mgr))
51-
g.Expect(add(mgr, recFn)).NotTo(gomega.HaveOccurred())
51+
g.Expect(add(mgr, recFn)).To(gomega.Succeed())
5252

5353
stopMgr, mgrStopped := StartTestManager(mgr, g)
5454

‎test/project/pkg/controller/healthcheckpolicy/healthcheckpolicy_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestReconcile(t *testing.T) {
4848
c = mgr.GetClient()
4949

5050
recFn, requests := SetupTestReconcile(newReconciler(mgr))
51-
g.Expect(add(mgr, recFn)).NotTo(gomega.HaveOccurred())
51+
g.Expect(add(mgr, recFn)).To(gomega.Succeed())
5252

5353
stopMgr, mgrStopped := StartTestManager(mgr, g)
5454

‎test/project/pkg/controller/kraken/kraken_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestReconcile(t *testing.T) {
4848
c = mgr.GetClient()
4949

5050
recFn, requests := SetupTestReconcile(newReconciler(mgr))
51-
g.Expect(add(mgr, recFn)).NotTo(gomega.HaveOccurred())
51+
g.Expect(add(mgr, recFn)).To(gomega.Succeed())
5252

5353
stopMgr, mgrStopped := StartTestManager(mgr, g)
5454

0 commit comments

Comments
 (0)