Add integration tests

To reflect test coverage on BuildRun failures and to asser for the correct Condition fields inside the object.
shipwright-io · Mar 12, 2021 · cf769d5 · cf769d5
1 parent dde3f64
commit cf769d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/test/integration/build_to_buildruns_test.go b/test/integration/build_to_buildruns_test.go
@@ -17,6 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/reconciler/buildrun/resources"
 	"github.com/shipwright-io/build/test"
 )
 
@@ -232,10 +233,10 @@ var _ = Describe("Integration tests Build and BuildRuns", func() {
 
 			br, err := tb.GetBR(buildRunObject.Name)
 			Expect(err).To(BeNil())
-			Expect(br.Status.Reason).To(Equal(fmt.Sprintf("Build.shipwright.io \"%s\" not found", BUILD+tb.Namespace)))
+			Expect(br.Status.Reason).To(Equal(fmt.Sprintf("build.shipwright.io \"%s\" not found", BUILD+tb.Namespace)))
 			Expect(br.Status.StartTime).To(BeNil())
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse))
-			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("Failed"))
+			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal(resources.ConditionBuildNotFound))
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found"))
 
 		})
@@ -262,7 +263,7 @@ var _ = Describe("Integration tests Build and BuildRuns", func() {
 
 			Expect(br.Status.Reason).To(Equal(fmt.Sprintf("the Build is not registered correctly, build: %s, registered status: False, reason: SpecOutputSecretRefNotFound", BUILD+tb.Namespace)))
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse))
-			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("Failed"))
+			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildRegistrationFailed"))
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("Build is not registered correctly"))
 		})
 	})
@@ -293,9 +294,9 @@ var _ = Describe("Integration tests Build and BuildRuns", func() {
 			Expect(err).To(BeNil())
 			Expect(br.Status.CompletionTime).ToNot(BeNil())
 			Expect(br.Status.StartTime).To(BeNil())
-			Expect(br.Status.Reason).To(Equal(fmt.Sprintf("Build.shipwright.io \"%s\" not found", BUILD+tb.Namespace+"foobar")))
+			Expect(br.Status.Reason).To(Equal(fmt.Sprintf("build.shipwright.io \"%s\" not found", BUILD+tb.Namespace+"foobar")))
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Status).To(Equal(corev1.ConditionFalse))
-			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("Failed"))
+			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Reason).To(Equal("BuildNotFound"))
 			Expect(br.Status.GetCondition(v1alpha1.Succeeded).Message).To(ContainSubstring("not found"))
 		})
 	})

diff --git a/test/integration/buildruns_to_sa_test.go b/test/integration/buildruns_to_sa_test.go
@@ -7,10 +7,9 @@ package integration_test
 import (
 	"fmt"
 
-	corev1 "k8s.io/api/core/v1"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 
 	"github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
 	"github.com/shipwright-io/build/test"
@@ -152,12 +151,13 @@ var _ = Describe("Integration tests BuildRuns and Service-accounts", func() {
 
 			Expect(tb.CreateBR(buildRunObject)).To(BeNil())
 
-			br, err := tb.GetBRTillCompletion(buildRunObject.Name)
+			br, _ := tb.GetBRTillCompletion(buildRunObject.Name)
 			Expect(err).To(BeNil())
 			buildRunCondition := br.Status.GetCondition(v1alpha1.Succeeded)
+
 			Expect(buildRunCondition).ToNot(BeNil())
 			Expect(buildRunCondition.Status).To(Equal(corev1.ConditionFalse))
-			Expect(buildRunCondition.Reason).To(Equal("Failed"))
+			Expect(buildRunCondition.Reason).To(Equal("ServiceAccountNotFound"))
 			Expect(buildRunCondition.Message).To(ContainSubstring("not found"))
 		})
 	})