Skip to content

Replace method 'Should(Succeed())' with 'NotTo(HaveOccurred())' #3898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joelanford merged 1 commit into from
Sep 17, 2020
Merged

Replace method 'Should(Succeed())' with 'NotTo(HaveOccurred())' #3898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e-ansible/e2e_ansible_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var _ = Describe("Running ansible projects", func() {

By("deploying project on the cluster")
err := tc.Make("deploy", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
By("deleting Curl Pod created")
Expand Down
4 changes: 2 additions & 2 deletions test/e2e-ansible/e2e_ansible_olm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ var _ = Describe("Integrating ansible Projects with OLM", func() {
if isRunningOnKind() {
By("loading the bundle image into Kind cluster")
err = tc.LoadImageToKindClusterWithName(bundleImage)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

By("adding the 'packagemanifests' rule to the Makefile")
err = tc.AddPackagemanifestsTarget()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("generating the operator package manifests")
err = tc.Make("packagemanifests", "IMG="+tc.ImageName)
Expand Down
16 changes: 8 additions & 8 deletions test/e2e-ansible/e2e_ansible_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var _ = BeforeSuite(func(done Done) {

By("checking the cluster type")
kubectx, err = tc.Kubectl.Command("config", "current-context")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("checking API resources applied on Cluster")
output, err := tc.Kubectl.Command("api-resources")
Expand Down Expand Up @@ -101,7 +101,7 @@ var _ = BeforeSuite(func(done Done) {
"--plugins", "ansible",
"--project-version", "3-alpha",
"--domain", tc.Domain)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("creating the Memcached API")
err = tc.CreateAPI(
Expand All @@ -110,7 +110,7 @@ var _ = BeforeSuite(func(done Done) {
"--kind", tc.Kind,
"--generate-playbook",
"--generate-role")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("replacing project Dockerfile to use ansible base image with the dev tag")
testutils.ReplaceRegexInFile(filepath.Join(tc.Dir, "Dockerfile"), "quay.io/operator-framework/ansible-operator:.*", "quay.io/operator-framework/ansible-operator:dev")
Expand All @@ -134,7 +134,7 @@ var _ = BeforeSuite(func(done Done) {
"--version", tc.Version,
"--kind", "Memfin",
"--generate-role")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("adding task to delete config map")
testutils.ReplaceInFile(filepath.Join(tc.Dir, "roles", "memfin", "tasks", "main.yml"),
Expand All @@ -150,24 +150,24 @@ var _ = BeforeSuite(func(done Done) {
"--version", tc.Version,
"--kind", "Foo",
"--generate-role")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("adding RBAC permissions for the Memcached Kind")
testutils.ReplaceInFile(filepath.Join(tc.Dir, "config", "rbac", "role.yaml"),
"# +kubebuilder:scaffold:rules", rolesForBaseOperator)

By("checking the kustomize setup")
err = tc.Make("kustomize")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("building the project image")
err = tc.Make("docker-build", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

if isRunningOnKind() {
By("loading the project image into Kind cluster")
err = tc.LoadImageToKindCluster()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

close(done)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-go/e2e_go_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var _ = Describe("operator-sdk", func() {

By("deploying project on the cluster")
err := tc.Make("deploy", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
By("cleaning up the operator and resources")
Expand Down
4 changes: 2 additions & 2 deletions test/e2e-go/e2e_go_olm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ var _ = Describe("Integrating Go Projects with OLM", func() {
if isRunningOnKind() {
By("loading the bundle image into Kind cluster")
err = tc.LoadImageToKindClusterWithName(bundleImage)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

By("adding the 'packagemanifests' rule to the Makefile")
err = tc.AddPackagemanifestsTarget()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("generating the operator package manifests")
err = tc.Make("packagemanifests", "IMG="+tc.ImageName)
Expand Down
12 changes: 6 additions & 6 deletions test/e2e-go/e2e_go_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var _ = BeforeSuite(func(done Done) {

By("checking the cluster type")
kubectx, err = tc.Kubectl.Command("config", "current-context")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("checking API resources applied on Cluster")
output, err := tc.Kubectl.Command("api-resources")
Expand Down Expand Up @@ -99,7 +99,7 @@ var _ = BeforeSuite(func(done Done) {
"--repo", path.Join("github.com", "example", projectName),
"--domain", tc.Domain,
"--fetch-deps=false")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("by adding scorecard custom patch file")
err = tc.AddScorecardCustomPatchFile()
Expand All @@ -114,7 +114,7 @@ var _ = BeforeSuite(func(done Done) {
"--resource",
"--controller",
"--make=false")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("implementing the API")
Expect(kbtestutils.InsertCode(
Expand All @@ -132,16 +132,16 @@ var _ = BeforeSuite(func(done Done) {

By("checking the kustomize setup")
err = tc.Make("kustomize")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("building the project image")
err = tc.Make("docker-build", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

if isRunningOnKind() {
By("loading the project image into Kind cluster")
err = tc.LoadImageToKindCluster()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

close(done)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-helm/e2e_helm_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var _ = Describe("Running Helm projects", func() {

By("deploying project on the cluster")
err := tc.Make("deploy", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
By("deleting Curl Pod created")
Expand Down
4 changes: 2 additions & 2 deletions test/e2e-helm/e2e_helm_olm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ var _ = Describe("Integrating Helm Projects with OLM", func() {
if isRunningOnKind() {
By("loading the bundle image into Kind cluster")
err = tc.LoadImageToKindClusterWithName(bundleImage)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

By("adding the 'packagemanifests' rule to the Makefile")
err = tc.AddPackagemanifestsTarget()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("generating the operator package manifests")
err = tc.Make("packagemanifests", "IMG="+tc.ImageName)
Expand Down
12 changes: 6 additions & 6 deletions test/e2e-helm/e2e_helm_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var _ = BeforeSuite(func(done Done) {

By("checking the cluster type")
kubectx, err = tc.Kubectl.Command("config", "current-context")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("checking API resources applied on Cluster")
output, err := tc.Kubectl.Command("api-resources")
Expand Down Expand Up @@ -94,30 +94,30 @@ var _ = BeforeSuite(func(done Done) {
"--plugins", "helm",
"--project-version", "3-alpha",
"--domain", tc.Domain)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("creating an API definition")
err = tc.CreateAPI(
"--group", tc.Group,
"--version", tc.Version,
"--kind", tc.Kind)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("replacing project Dockerfile to use Helm base image with the dev tag")
testutils.ReplaceRegexInFile(filepath.Join(tc.Dir, "Dockerfile"), "quay.io/operator-framework/helm-operator:.*", "quay.io/operator-framework/helm-operator:dev")

By("checking the kustomize setup")
err = tc.Make("kustomize")
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

By("building the project image")
err = tc.Make("docker-build", "IMG="+tc.ImageName)
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())

if isRunningOnKind() {
By("loading the project image into Kind cluster")
err = tc.LoadImageToKindCluster()
Expect(err).Should(Succeed())
Expect(err).NotTo(HaveOccurred())
}

close(done)
Expand Down