update/add integration tests

test/integration/buildruns_to_taskruns_test.go

@@ -357,7 +357,7 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() {
 		})
 	})
 
-	Context("when a buildrun is created and cancelled", func() {
+	Context("when a buildrun is created and the taskrun is cancelled", func() {
 
 		BeforeEach(func() {
 			buildSample = []byte(test.BuildCBSMinimal)
@@ -390,6 +390,39 @@ var _ = Describe("Integration tests BuildRuns and TaskRuns", func() {
 		})
 	})
 
+	Context("when a buildrun is created and the buildrun is cancelled", func() {
+
+		BeforeEach(func() {
+			buildSample = []byte(test.BuildCBSMinimal)
+			buildRunSample = []byte(test.MinimalBuildRun)
+		})
+
+		It("should reflect a TaskRunCancelled reason in the taskrun, BuildRunCanceled in the buildrun, and no completionTime", func() {
+
+			Expect(tb.CreateBuild(buildObject)).To(BeNil())
+
+			buildObject, err = tb.GetBuildTillValidation(buildObject.Name)
+			Expect(err).To(BeNil())
+
+			Expect(tb.CreateBR(buildRunObject)).To(BeNil())
+
+			bro, err := tb.GetBRTillStartTime(buildRunObject.Name)
+			Expect(err).To(BeNil())
+
+			bro.Spec.Status = v1alpha1.BuildRunSpecStatusCanceled
+			err = tb.UpdateBR(bro)
+			Expect(err).To(BeNil())
+
+			expectedReason := "TaskRunCancelled"
+			actualReason, err := tb.GetTRTillDesiredReason(buildRunObject.Name, expectedReason)
+			Expect(err).To(BeNil(), fmt.Sprintf("failed to get desired TaskRun reason; expected %s, got %s", expectedReason, actualReason))
+
+			expectedReason = v1alpha1.BuildRunSpecStatusCanceled
+			actualReason, err = tb.GetBRTillDesiredReason(buildRunObject.Name, expectedReason)
+			Expect(err).To(BeNil(), fmt.Sprintf("failed to get desired BuildRun reason; expected %s, got %s", expectedReason, actualReason))
+		})
+	})
+
 	Context("when a buildrun is created and the taskrun deleted before completion", func() {
 
 		BeforeEach(func() {

test/utils/buildruns.go

@@ -30,6 +30,16 @@ func (t *TestBuild) CreateBR(buildRun *v1alpha1.BuildRun) error {
 	return nil
 }
 
+// UpdateBR updates a BuildRun on the current test namespace
+func (t *TestBuild) UpdateBR(buildRun *v1alpha1.BuildRun) error {
+	brInterface := t.BuildClientSet.ShipwrightV1alpha1().BuildRuns(t.Namespace)
+	_, err := brInterface.Update(context.TODO(), buildRun, metav1.UpdateOptions{})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // GetBR retrieves a BuildRun from a desired namespace
 // Deprecated: Use LookupBuildRun instead.
 func (t *TestBuild) GetBR(name string) (*v1alpha1.BuildRun, error) {