Skip to content
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

Fix TestTaskRunPipelineRunCancel failure #2850

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Fix TestTaskRunPipelineRunCancel failure #2850

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
387b40a
Fix TestTaskRunPipelineRunCancel failure
GregDritschler Jun 23, 2020
6251c4e
Merge remote-tracking branch 'origin/master' into issue2840
GregDritschler Jun 23, 2020
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
17 changes: 14 additions & 3 deletions test/v1alpha1/cancel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ limitations under the License.
package test

import (
"encoding/json"
"fmt"
"sync"
"testing"

tb "github.com/tektoncd/pipeline/internal/builder/v1alpha1"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
"gomodules.xyz/jsonpatch/v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
knativetest "knative.dev/pkg/test"
)

Expand Down Expand Up @@ -118,9 +121,17 @@ func TestTaskRunPipelineRunCancel(t *testing.T) {
t.Fatalf("Failed to get PipelineRun `%s`: %s", "pear", err)
}

pr.Spec.Status = v1alpha1.PipelineRunSpecStatusCancelled
if _, err := c.PipelineRunClient.Update(pr); err != nil {
t.Fatalf("Failed to cancel PipelineRun `%s`: %s", "pear", err)
patches := []jsonpatch.JsonPatchOperation{{
Operation: "add",
Path: "/spec/status",
Value: v1alpha1.PipelineRunSpecStatusCancelled,
}}
patchBytes, err := json.Marshal(patches)
if err != nil {
t.Fatalf("failed to marshal patch bytes in order to cancel")
}
if _, err := c.PipelineRunClient.Patch(pr.Name, types.JSONPatchType, patchBytes, ""); err != nil {
t.Fatalf("Failed to patch PipelineRun `%s` with cancellation: %s", "pear", err)
}

t.Logf("Waiting for PipelineRun %s in namespace %s to be cancelled", "pear", namespace)
Expand Down