Ginkgo v2 additional changes (#2832)

Update deprecated v1 calls to use v2
cloudfoundry · Mar 27, 2024 · cc638bf · cc638bf
1 parent b4dad05
commit cc638bf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/integration/shared/experimental/experimental_suite_test.go b/integration/shared/experimental/experimental_suite_test.go
@@ -43,7 +43,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 
 	return nil
 }, func(_ []byte) {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 	// Ginkgo Globals
 	SetDefaultEventuallyTimeout(CFEventuallyTimeout)
 	SetDefaultConsistentlyDuration(CFConsistentlyTimeout)
@@ -54,16 +54,16 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	// Enable Experimental Flag
 	helpers.TurnOnExperimental()
 
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 })
 
 var _ = SynchronizedAfterSuite(func() {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
 	suiteHomeDir := helpers.SetHomeDir()
 	helpers.SetAPI()
 	helpers.LoginCF()
 	helpers.DestroyHomeDir(suiteHomeDir)
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
 }, func() {})
 
 var _ = BeforeEach(func() {

diff --git a/integration/shared/global/global_suite_test.go b/integration/shared/global/global_suite_test.go
@@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each=============================="))
 	return nil
 }, func(_ []byte) {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
-	if GinkgoParallelNode() != 1 {
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
+	if GinkgoParallelProcess() != 1 {
 		Fail("Test suite cannot run in parallel")
 	}
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 })
 
 var _ = BeforeEach(func() {

diff --git a/integration/shared/performance/performance_suite_test.go b/integration/shared/performance/performance_suite_test.go
@@ -39,7 +39,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 
 	return nil
 }, func(_ []byte) {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 	// Ginkgo Globals
 	SetDefaultEventuallyTimeout(CFEventuallyTimeout)
 	SetDefaultConsistentlyDuration(CFConsistentlyTimeout)
@@ -48,17 +48,17 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	helpers.TurnOffColors()
 	perfOrg, perfSpace = helpers.SetupReadOnlyOrgAndSpace()
 
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 })
 
 var _ = SynchronizedAfterSuite(func() {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
 	homeDir = helpers.SetHomeDir()
 	helpers.SetAPI()
 	helpers.LoginCF()
 	helpers.QuickDeleteOrg(perfOrg)
 	helpers.DestroyHomeDir(homeDir)
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized After Each==============================", GinkgoParallelProcess())))
 }, func() {})
 
 var _ = BeforeEach(func() {

diff --git a/integration/v7/global/global_suite_test.go b/integration/v7/global/global_suite_test.go
@@ -48,11 +48,11 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	GinkgoWriter.Write([]byte("==============================End of Global FIRST Node Synchronized Before Each=============================="))
 	return nil
 }, func(_ []byte) {
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
-	if GinkgoParallelNode() != 1 {
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
+	if GinkgoParallelProcess() != 1 {
 		Fail("Test suite cannot run in parallel")
 	}
-	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelNode())))
+	GinkgoWriter.Write([]byte(fmt.Sprintf("==============================End of Global Node %d Synchronized Before Each==============================", GinkgoParallelProcess())))
 })
 
 var _ = BeforeEach(func() {

diff --git a/integration/v7/isolated/app_command_test.go b/integration/v7/isolated/app_command_test.go
@@ -348,7 +348,7 @@ applications:
 
 					BeforeEach(func() {
 						tcpDomain = helpers.NewDomain(orgName, helpers.NewDomainName("tcp"))
-						tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelNode()))
+						tcpDomain.CreateWithRouterGroup(helpers.FindOrCreateTCPRouterGroup(GinkgoParallelProcess()))
 						helpers.WithHelloWorldApp(func(appDir string) {
 							manifestContents := []byte(fmt.Sprintf(`
 ---