Skip to content

Commit 174b2c9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4166 from camilamacedo86/fix-e2e-master-changed
🐛 (go/v4): Follow -up: Refactor e2e-tests for clearer error handling and readable logs
2 parents 9a8b2f8 + f3d5a79 commit 174b2c9

File tree

7 files changed

+42
-21
lines changed

7 files changed

+42
-21
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,18 @@ var _ = Describe("Manager", Ordered, func() {
181181
BeforeAll(func() {
182182
By("creating manager namespace")
183183
cmd := exec.Command("kubectl", "create", "ns", namespace)
184-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
184+
_, err := utils.Run(cmd)
185+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
185186
186187
By("installing CRDs")
187188
cmd = exec.Command("make", "install")
188-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
189+
_, err = utils.Run(cmd)
190+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
189191
190192
By("deploying the controller-manager")
191193
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
192-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
194+
_, err = utils.Run(cmd)
195+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
193196
})
194197
195198
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎testdata/project-v4-multigroup/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎testdata/project-v4-with-plugins/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

‎testdata/project-v4/test/e2e/e2e_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ var _ = Describe("Manager", Ordered, func() {
4848
BeforeAll(func() {
4949
By("creating manager namespace")
5050
cmd := exec.Command("kubectl", "create", "ns", namespace)
51-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create namespace")
51+
_, err := utils.Run(cmd)
52+
Expect(err).NotTo(HaveOccurred(), "Failed to create namespace")
5253

5354
By("installing CRDs")
5455
cmd = exec.Command("make", "install")
55-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to install CRDs")
56+
_, err = utils.Run(cmd)
57+
Expect(err).NotTo(HaveOccurred(), "Failed to install CRDs")
5658

5759
By("deploying the controller-manager")
5860
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectImage))
59-
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
61+
_, err = utils.Run(cmd)
62+
Expect(err).NotTo(HaveOccurred(), "Failed to deploy the controller-manager")
6063
})
6164

6265
// After all tests have been executed, clean up by undeploying the controller, uninstalling CRDs,

0 commit comments

Comments
 (0)