Skip to content

Commit acda46b

Browse files
committed
Remove {Before,After} Suite specific timeout
1 parent b1e8455 commit acda46b

17 files changed

+21
-21
lines changed

pkg/builder/builder_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var _ = BeforeSuite(func() {
6363

6464
webhook.DefaultPort, _, err = addr.Suggest("")
6565
Expect(err).NotTo(HaveOccurred())
66-
}, 60)
66+
})
6767

6868
var _ = AfterSuite(func() {
6969
Expect(testenv.Stop()).To(Succeed())

pkg/cache/cache_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var _ = BeforeSuite(func() {
5050

5151
clientset, err = kubernetes.NewForConfig(cfg)
5252
Expect(err).NotTo(HaveOccurred())
53-
}, 60)
53+
})
5454

5555
var _ = AfterSuite(func() {
5656
Expect(testenv.Stop()).To(Succeed())

pkg/certwatcher/certwatcher_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ func TestSource(t *testing.T) {
4040

4141
var _ = BeforeSuite(func() {
4242
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
43-
}, 60)
43+
})
4444

4545
var _ = AfterSuite(func() {
4646
for _, file := range []string{certPath, keyPath} {
4747
_ = os.Remove(file)
4848
}
49-
}, 60)
49+
})

pkg/client/apiutil/apiutil_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ var _ = BeforeSuite(func() {
4141

4242
// for things that technically need a rest.Config for defaulting, but don't actually use them
4343
cfg = &rest.Config{}
44-
}, 60)
44+
})

pkg/client/client_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var _ = BeforeSuite(func() {
5555
Expect(err).NotTo(HaveOccurred())
5656

5757
Expect(pkg.AddToScheme(scheme.Scheme)).NotTo(HaveOccurred())
58-
}, 60)
58+
})
5959

6060
var _ = AfterSuite(func() {
6161
Expect(testenv.Stop()).To(Succeed())

pkg/client/config/config_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ func TestConfig(t *testing.T) {
3535

3636
var _ = BeforeSuite(func() {
3737
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
38-
}, 60)
38+
})

pkg/client/fake/client_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ func TestSource(t *testing.T) {
3535

3636
var _ = BeforeSuite(func() {
3737
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
38-
}, 60)
38+
})

pkg/cluster/cluster_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var _ = BeforeSuite(func() {
6363

6464
clientset, err = kubernetes.NewForConfig(cfg)
6565
Expect(err).NotTo(HaveOccurred())
66-
}, 60)
66+
})
6767

6868
var _ = AfterSuite(func() {
6969
Expect(testenv.Stop()).To(Succeed())

pkg/controller/controller_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var _ = BeforeSuite(func() {
8282

8383
// Prevent the metrics listener being created
8484
metrics.DefaultBindAddress = "0"
85-
}, 60)
85+
})
8686

8787
var _ = AfterSuite(func() {
8888
Expect(testenv.Stop()).To(Succeed())

pkg/envtest/envtest_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var _ = BeforeSuite(func() {
4444
initializeWebhookInEnvironment()
4545
_, err := env.Start()
4646
Expect(err).NotTo(HaveOccurred())
47-
}, StartTimeout)
47+
})
4848

4949
func initializeWebhookInEnvironment() {
5050
namespacedScopeV1 := admissionv1.NamespacedScope
@@ -133,4 +133,4 @@ func initializeWebhookInEnvironment() {
133133

134134
var _ = AfterSuite(func() {
135135
Expect(env.Stop()).NotTo(HaveOccurred())
136-
}, StopTimeout)
136+
})

pkg/internal/controller/controller_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var _ = BeforeSuite(func() {
5050

5151
clientset, err = kubernetes.NewForConfig(cfg)
5252
Expect(err).NotTo(HaveOccurred())
53-
}, 60)
53+
})
5454

5555
var _ = AfterSuite(func() {
5656
Expect(testenv.Stop()).To(Succeed())

pkg/internal/recorder/recorder_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var _ = BeforeSuite(func() {
5050

5151
clientset, err = kubernetes.NewForConfig(cfg)
5252
Expect(err).NotTo(HaveOccurred())
53-
}, 60)
53+
})
5454

5555
var _ = AfterSuite(func() {
5656
Expect(testenv.Stop()).To(Succeed())

pkg/manager/manager_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var _ = BeforeSuite(func() {
7272

7373
// Prevent the metrics listener being created
7474
metrics.DefaultBindAddress = "0"
75-
}, 60)
75+
})
7676

7777
var _ = AfterSuite(func() {
7878
Expect(testenv.Stop()).To(Succeed())

pkg/source/source_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ var _ = BeforeSuite(func() {
6464
defer GinkgoRecover()
6565
Expect(icache.Start(ctx)).NotTo(HaveOccurred())
6666
}()
67-
}, 60)
67+
})
6868

6969
var _ = AfterSuite(func() {
7070
cancel()
7171
Expect(testenv.Stop()).To(Succeed())
72-
}, 5)
72+
})

pkg/webhook/admission/admission_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ func TestAdmissionWebhook(t *testing.T) {
3535

3636
var _ = BeforeSuite(func() {
3737
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
38-
}, 60)
38+
})

pkg/webhook/authentication/authentication_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ func TestAuthenticationWebhook(t *testing.T) {
3535

3636
var _ = BeforeSuite(func() {
3737
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
38-
}, 60)
38+
})

pkg/webhook/webhook_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ var _ = BeforeSuite(func() {
5050
var err error
5151
cfg, err = testenv.Start()
5252
Expect(err).NotTo(HaveOccurred())
53-
}, 60)
53+
})
5454

5555
var _ = AfterSuite(func() {
5656
fmt.Println("stopping?")
5757
Expect(testenv.Stop()).To(Succeed())
58-
}, 60)
58+
})
5959

6060
func initializeWebhookInEnvironment() {
6161
namespacedScopeV1 := admissionv1.NamespacedScope

0 commit comments

Comments
 (0)