From 3d12ff35c82f8767adbf5c09481830bf5064141a Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Wed, 21 Oct 2020 16:03:34 -0700 Subject: [PATCH] Make t.Parallel() come first --- test/timeout_test.go | 8 ++++---- test/v1alpha1/timeout_test.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/timeout_test.go b/test/timeout_test.go index e5ac47a782b..321a2ef4abb 100644 --- a/test/timeout_test.go +++ b/test/timeout_test.go @@ -38,11 +38,11 @@ import ( // verify that pipelinerun timeout works and leads to the the correct TaskRun statuses // and pod deletions. func TestPipelineRunTimeout(t *testing.T) { + t.Parallel() // cancel the context after we have waited a suitable buffer beyond the given deadline. ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) @@ -171,10 +171,10 @@ func TestPipelineRunTimeout(t *testing.T) { // TestStepTimeout is an integration test that will verify a Step can be timed out. func TestStepTimeout(t *testing.T) { + t.Parallel() ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) @@ -242,11 +242,11 @@ func TestStepTimeout(t *testing.T) { // TestTaskRunTimeout is an integration test that will verify a TaskRun can be timed out. func TestTaskRunTimeout(t *testing.T) { + t.Parallel() timeout := 30 * time.Second ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) @@ -299,10 +299,10 @@ func TestTaskRunTimeout(t *testing.T) { } func TestPipelineTaskTimeout(t *testing.T) { + t.Parallel() ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) diff --git a/test/v1alpha1/timeout_test.go b/test/v1alpha1/timeout_test.go index b8bb6ef290c..608dc3e3527 100644 --- a/test/v1alpha1/timeout_test.go +++ b/test/v1alpha1/timeout_test.go @@ -37,10 +37,10 @@ import ( // verify that pipelinerun timeout works and leads to the the correct TaskRun statuses // and pod deletions. func TestPipelineRunTimeout(t *testing.T) { + t.Parallel() ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) @@ -139,10 +139,10 @@ func TestPipelineRunTimeout(t *testing.T) { // TestTaskRunTimeout is an integration test that will verify a TaskRun can be timed out. func TestTaskRunTimeout(t *testing.T) { + t.Parallel() ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace) @@ -166,10 +166,10 @@ func TestTaskRunTimeout(t *testing.T) { } func TestPipelineTaskTimeout(t *testing.T) { + t.Parallel() ctx, cancel := context.WithTimeout(context.Background(), timeout+2*time.Minute) defer cancel() c, namespace := setup(ctx, t) - t.Parallel() knativetest.CleanupOnInterrupt(func() { tearDown(context.Background(), t, c, namespace) }, t.Logf) defer tearDown(context.Background(), t, c, namespace)