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

Update TaskRun Tests from Test Builders to Structs #1292

Merged
merged 2 commits into from
Feb 4, 2021
Merged

Update TaskRun Tests from Test Builders to Structs #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc5e5c
Update TaskRun Tests from Test Builders to Structs
vinamra28 Jan 24, 2021
0e0b113
Fix eventlistener manifests as per latest triggers
vinamra28 Feb 4, 2021
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
100 changes: 66 additions & 34 deletions pkg/cmd/taskrun/cancel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"errors"
"testing"

tb "github.com/tektoncd/cli/internal/builder/v1alpha1"
"github.com/tektoncd/cli/pkg/test"
cb "github.com/tektoncd/cli/pkg/test/builder"
testDynamic "github.com/tektoncd/cli/pkg/test/dynamic"
Expand All @@ -37,28 +36,50 @@ import (

func TestTaskRunCancel(t *testing.T) {
trs := []*v1alpha1.TaskRun{
tb.TaskRun("taskrun-1",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "task"),
tb.TaskRunSpec(tb.TaskRunTaskRef("task")),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionUnknown,
Reason: v1beta1.TaskRunReasonRunning.String(),
}),
),
),
tb.TaskRun("taskrun-2",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "failure-task"),
tb.TaskRunSpec(tb.TaskRunTaskRef("failure-task")),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
{
ObjectMeta: metav1.ObjectMeta{
Name: "taskrun-1",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "task"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "task",
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionUnknown,
Reason: v1beta1.TaskRunReasonRunning.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "taskrun-2",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "failure-task"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "failure-task",
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
}

trs2 := []*v1alpha1.TaskRun{
Expand Down Expand Up @@ -87,17 +108,28 @@ func TestTaskRunCancel(t *testing.T) {
}

trs3 := []*v1alpha1.TaskRun{
tb.TaskRun("cancel-taskrun-1",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "cancel-task"),
tb.TaskRunSpec(tb.TaskRunTaskRef("cancel-task")),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionFalse,
Reason: v1beta1.TaskRunReasonCancelled.String(),
}),
),
),
{
ObjectMeta: metav1.ObjectMeta{
Name: "cancel-taskrun-1",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "cancel-task"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "cancel-task",
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionFalse,
Reason: v1beta1.TaskRunReasonCancelled.String(),
},
},
},
},
},
}

ns := []*corev1.Namespace{
Expand Down
233 changes: 149 additions & 84 deletions pkg/cmd/taskrun/delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"strings"
"testing"

tb "github.com/tektoncd/cli/internal/builder/v1alpha1"
"github.com/tektoncd/cli/pkg/test"
cb "github.com/tektoncd/cli/pkg/test/builder"
testDynamic "github.com/tektoncd/cli/pkg/test/dynamic"
Expand All @@ -30,7 +29,6 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/dynamic"
"knative.dev/pkg/apis"
duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
)

Expand All @@ -45,94 +43,161 @@ func TestTaskRunDelete(t *testing.T) {
}

tasks := []*v1alpha1.Task{
tb.Task("random",
tb.TaskNamespace("ns"),
),
{
ObjectMeta: metav1.ObjectMeta{
Name: "random",
Namespace: "ns",
},
},
}

clustertasks := []*v1alpha1.ClusterTask{
tb.ClusterTask("random"),
{
ObjectMeta: metav1.ObjectMeta{
Name: "random",
},
},
}

trs := []*v1alpha1.TaskRun{
tb.TaskRun("tr0-1",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.NamespacedTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
tb.TaskRun("tr0-2",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.NamespacedTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
tb.TaskRun("tr0-3",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/task", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.NamespacedTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
tb.TaskRun("tr0-4",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/clusterTask", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.ClusterTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
tb.TaskRun("tr0-5",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/clusterTask", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.ClusterTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
tb.TaskRun("tr0-6",
tb.TaskRunNamespace("ns"),
tb.TaskRunLabel("tekton.dev/clusterTask", "random"),
tb.TaskRunSpec(
tb.TaskRunTaskRef("random", tb.TaskRefKind(v1alpha1.ClusterTaskKind)),
),
tb.TaskRunStatus(
tb.StatusCondition(apis.Condition{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
}),
),
),
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-1",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.NamespacedTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-2",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.NamespacedTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-3",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/task": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.NamespacedTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-4",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/clusterTask": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.ClusterTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-5",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/clusterTask": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.ClusterTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: "tr0-6",
Namespace: "ns",
Labels: map[string]string{"tekton.dev/clusterTask": "random"},
},
Spec: v1alpha1.TaskRunSpec{
TaskRef: &v1alpha1.TaskRef{
Name: "random",
Kind: v1alpha1.ClusterTaskKind,
},
},
Status: v1alpha1.TaskRunStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{
{
Status: corev1.ConditionTrue,
Reason: v1beta1.TaskRunReasonSuccessful.String(),
},
},
},
},
},
}
type clients struct {
pipelineClient pipelinetest.Clients
Expand Down
Loading