Skip to content

Commit 787e718

Browse files
roguepikachusemmet95
authored andcommitted
chore: sets timeout in beforeeach nodes
Signed-off-by: Amit Singh <singhamitch@outlook.com> Signed-off-by: semmet95 <singhamitch@outlook.com>
1 parent 302f81a commit 787e718

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

controllers/suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package controllers
1919
import (
2020
"path/filepath"
2121
"testing"
22+
"time"
2223

2324
"github.com/crossplane/crossplane-runtime/pkg/event"
2425
cuexv1alpha1 "github.com/kubevela/pkg/apis/cue/v1alpha1"
@@ -56,7 +57,7 @@ func TestAPIs(t *testing.T) {
5657
RunSpecs(t, "Controller Suite")
5758
}
5859

59-
var _ = BeforeSuite(func() {
60+
var _ = BeforeSuite(func(ctx SpecContext) {
6061
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
6162

6263
By("bootstrapping test environment")
@@ -91,8 +92,7 @@ var _ = BeforeSuite(func() {
9192
Scheme: testScheme,
9293
Recorder: event.NewAPIRecorder(recorder),
9394
}
94-
95-
})
95+
}, NodeTimeout(1*time.Minute))
9696

9797
var _ = AfterSuite(func() {
9898
By("tearing down the test environment")

pkg/executor/suit_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestWorkflow(t *testing.T) {
4949
RunSpecs(t, "Test Definition Suite")
5050
}
5151

52-
var _ = BeforeSuite(func() {
52+
var _ = BeforeSuite(func(ctx SpecContext) {
5353
By("Bootstrapping test environment")
5454
testEnv = &envtest.Environment{
5555
ControlPlaneStartTimeout: time.Minute,
@@ -71,8 +71,7 @@ var _ = BeforeSuite(func() {
7171
singleton.KubeClient.Set(k8sClient)
7272
fakeDynamicClient := fake.NewSimpleDynamicClient(scheme)
7373
singleton.DynamicClient.Set(fakeDynamicClient)
74-
75-
})
74+
}, NodeTimeout(1*time.Minute))
7675

7776
var _ = AfterSuite(func() {
7877
By("Tearing down the test environment")

pkg/generator/suit_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestSteps(t *testing.T) {
4949
RunSpecs(t, "Test Definition Suite")
5050
}
5151

52-
var _ = BeforeSuite(func() {
52+
var _ = BeforeSuite(func(ctx SpecContext) {
5353
By("Bootstrapping test environment")
5454
testEnv = &envtest.Environment{
5555
ControlPlaneStartTimeout: time.Minute,
@@ -71,8 +71,7 @@ var _ = BeforeSuite(func() {
7171
singleton.KubeClient.Set(k8sClient)
7272
fakeDynamicClient := fake.NewSimpleDynamicClient(scheme)
7373
singleton.DynamicClient.Set(fakeDynamicClient)
74-
75-
})
74+
}, NodeTimeout(1*time.Minute))
7675

7776
var _ = AfterSuite(func() {
7877
By("Tearing down the test environment")

pkg/providers/kube/kube_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestProvider(t *testing.T) {
5757
RunSpecs(t, "Test Definition Suite")
5858
}
5959

60-
var _ = BeforeSuite(func() {
60+
var _ = BeforeSuite(func(ctx SpecContext) {
6161
By("Bootstrapping test environment")
6262
testEnv = &envtest.Environment{
6363
ControlPlaneStartTimeout: time.Minute,
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
7575
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
7676
Expect(err).ToNot(HaveOccurred())
7777
Expect(k8sClient).ToNot(BeNil())
78-
})
78+
}, NodeTimeout(2*time.Minute))
7979

8080
var _ = AfterSuite(func() {
8181
By("Tearing down the test environment")

pkg/providers/legacy/kube/kube_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestProvider(t *testing.T) {
5757
RunSpecs(t, "Test Definition Suite")
5858
}
5959

60-
var _ = BeforeSuite(func() {
60+
var _ = BeforeSuite(func(ctx SpecContext) {
6161
By("Bootstrapping test environment")
6262
testEnv = &envtest.Environment{
6363
ControlPlaneStartTimeout: time.Minute,
@@ -75,7 +75,7 @@ var _ = BeforeSuite(func() {
7575
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
7676
Expect(err).ToNot(HaveOccurred())
7777
Expect(k8sClient).ToNot(BeNil())
78-
})
78+
}, NodeTimeout(2*time.Minute))
7979

8080
var _ = AfterSuite(func() {
8181
By("Tearing down the test environment")

pkg/webhook/v1alpha1/workflowrun/suite_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestAPIs(t *testing.T) {
5757
RunSpecs(t, "Controller Suite")
5858
}
5959

60-
var _ = BeforeSuite(func() {
60+
var _ = BeforeSuite(func(ctx SpecContext) {
6161
logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
6262
By("bootstrapping test environment")
6363

@@ -89,11 +89,9 @@ var _ = BeforeSuite(func() {
8989
decoder = admission.NewDecoder(testScheme)
9090
Expect(decoder).ToNot(BeNil())
9191

92-
ctx := context.Background()
9392
ns := corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "vela-system"}}
9493
Expect(k8sClient.Create(ctx, &ns)).Should(BeNil())
95-
96-
})
94+
}, NodeTimeout(1*time.Minute))
9795

9896
var _ = AfterSuite(func() {
9997
By("tearing down the test environment")

0 commit comments

Comments
 (0)