Skip to content

Commit cc638bf

Browse files
gururajshgururajsh
authored
Ginkgo v2 additional changes (#2832)
Update deprecated v1 calls to use v2
1 parent b4dad05 commit cc638bf

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎integration/shared/experimental/experimental_suite_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
4343

4444
return nil
4545
}, func(_ []byte) {
46-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
46+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
4747
// Ginkgo Globals
4848
SetDefaultEventuallyTimeout(CFEventuallyTimeout)
4949
SetDefaultConsistentlyDuration(CFConsistentlyTimeout)
@@ -54,16 +54,16 @@ var _ = SynchronizedBeforeSuite(func() []byte {
5454
// Enable Experimental Flag
5555
helpers.TurnOnExperimental()
5656

57-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
57+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
5858
})
5959

6060
var _ = SynchronizedAfterSuite(func() {
61-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
61+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
6262
suiteHomeDir := helpers.SetHomeDir()
6363
helpers.SetAPI()
6464
helpers.LoginCF()
6565
helpers.DestroyHomeDir(suiteHomeDir)
66-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
66+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
6767
}, func() {})
6868

6969
var _ = BeforeEach(func() {

‎integration/shared/global/global_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte {
4848
GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each=============================="))
4949
return nil
5050
}, func(_ []byte) {
51-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
52-
if GinkgoParallelNode() != 1 {
51+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
52+
if GinkgoParallelProcess() != 1 {
5353
Fail("Test suite cannot run in parallel")
5454
}
55-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
55+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
5656
})
5757

5858
var _ = BeforeEach(func() {

‎integration/shared/performance/performance_suite_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
3939

4040
return nil
4141
}, func(_ []byte) {
42-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
42+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
4343
// Ginkgo Globals
4444
SetDefaultEventuallyTimeout(CFEventuallyTimeout)
4545
SetDefaultConsistentlyDuration(CFConsistentlyTimeout)
@@ -48,17 +48,17 @@ var _ = SynchronizedBeforeSuite(func() []byte {
4848
helpers.TurnOffColors()
4949
perfOrg, perfSpace = helpers.SetupReadOnlyOrgAndSpace()
5050

51-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
51+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
5252
})
5353

5454
var _ = SynchronizedAfterSuite(func() {
55-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
55+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
5656
homeDir = helpers.SetHomeDir()
5757
helpers.SetAPI()
5858
helpers.LoginCF()
5959
helpers.QuickDeleteOrg(perfOrg)
6060
helpers.DestroyHomeDir(homeDir)
61-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
61+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
6262
}, func() {})
6363

6464
var _ = BeforeEach(func() {

‎integration/v7/global/global_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte {
4848
GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each=============================="))
4949
return nil
5050
}, func(_ []byte) {
51-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
52-
if GinkgoParallelNode() != 1 {
51+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
52+
if GinkgoParallelProcess() != 1 {
5353
Fail("Test suite cannot run in parallel")
5454
}
55-
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
55+
GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
5656
})
5757

5858
var _ = BeforeEach(func() {

‎integration/v7/isolated/app_command_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ applications:
348348

349349
BeforeEach(func() {
350350
tcpDomain = helpers.NewDomain(orgName, helpers.NewDomainName("tcp"))
351-
tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelNode()))
351+
tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelProcess()))
352352
helpers.WithHelloWorldApp(func(appDir string) {
353353
manifestContents := []byte(fmt.Sprintf(`
354354
---

0 commit comments

Comments
 (0)