Skip to content

Commit 8afeb40

Browse files
authored
Merge pull request #3786 from domcyrus/fix-scaffolding-test-template
fix: 🐛 scaffolding e2e template err check
2 parents 488bb98 + 1d28efd commit 8afeb40

File tree

9 files changed

+9
-0
lines changed
  • docs/book/src
    • component-config-tutorial/testdata/project/test/e2e
    • cronjob-tutorial/testdata/project/test/e2e
    • getting-started/testdata/project/test/e2e
  • pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e
  • testdata

9 files changed

+9
-0
lines changed

docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ var _ = Describe("controller", Ordered, func() {
101101
By("installing CRDs")
102102
cmd = exec.Command("make", "install")
103103
_, err = utils.Run(cmd)
104+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
104105
105106
By("deploying the controller-manager")
106107
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

testdata/project-v4-with-grafana/test/e2e/e2e_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ var _ = Describe("controller", Ordered, func() {
7474
By("installing CRDs")
7575
cmd = exec.Command("make", "install")
7676
_, err = utils.Run(cmd)
77+
ExpectWithOffset(1, err).NotTo(HaveOccurred())
7778

7879
By("deploying the controller-manager")
7980
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage))

0 commit comments

Comments
 (0)