Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V8: Ginkgo v2 additional changes #2836

Merged
merged 10 commits into from
Mar 28, 2024
Merged

V8: Ginkgo v2 additional changes #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53a5dbd
Update CLI to use ginkgo v2
gururajsh Mar 5, 2024
0c86f6c
run v8
gururajsh Mar 5, 2024
cf76230
Fix syntax
gururajsh Mar 5, 2024
05dfdc0
Remove on workflow run
gururajsh Mar 5, 2024
d9e3188
Remove PR Check
gururajsh Mar 5, 2024
268cf52
Revert workflow changes
gururajsh Mar 5, 2024
1d8c33f
Update checks-action version
gururajsh Mar 12, 2024
ce31efa
Fix go.mod gomega
a-b Mar 22, 2024
8d663d2
Ginkgo v2 additional changes (#2832)
gururajsh Mar 27, 2024
2604816
fix dependencies
gururajsh Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions integration/shared/experimental/experimental_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions integration/shared/global/global_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions integration/shared/performance/performance_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions integration/v7/global/global_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion integration/v7/isolated/app_command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(`
---
Expand Down
Loading