Skip to content

Commit 161d118

Browse files
Amin Jamaligeofffranks
Amin Jamali
authored and
geofffranks
committed
Bump to ginkgo/v2
1 parent 952b49b commit 161d118

File tree

130 files changed

+196
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+196
-207
lines changed

‎bbs_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package bbs_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"code.cloudfoundry.org/lager/lagertest"
1515
"code.cloudfoundry.org/tlsconfig"
1616

17-
. "github.com/onsi/ginkgo"
17+
. "github.com/onsi/ginkgo/v2"
1818
. "github.com/onsi/gomega"
1919
"github.com/onsi/gomega/ghttp"
2020
)

‎cmd/bbs/actual_lrp_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"code.cloudfoundry.org/bbs/models/test/model_helpers"
99
"code.cloudfoundry.org/bbs/test_helpers"
1010
"github.com/tedsuo/ifrit"
11-
"github.com/tedsuo/ifrit/ginkgomon"
11+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1212

1313
locketconfig "code.cloudfoundry.org/locket/cmd/locket/config"
1414
locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
1515

16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
)
1919

‎cmd/bbs/config/config_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package config_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎cmd/bbs/config/config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"code.cloudfoundry.org/lager/lagerflags"
1515
"code.cloudfoundry.org/locket"
1616

17-
. "github.com/onsi/ginkgo"
17+
. "github.com/onsi/ginkgo/v2"
1818
. "github.com/onsi/gomega"
1919
)
2020

‎cmd/bbs/debug_server_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"net"
66

77
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
8-
. "github.com/onsi/ginkgo"
8+
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"
10-
"github.com/tedsuo/ifrit/ginkgomon"
10+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1111
)
1212

1313
var _ = Describe("Debug Address", func() {

‎cmd/bbs/desired_lrp_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
99
"code.cloudfoundry.org/bbs/models"
1010
"code.cloudfoundry.org/bbs/models/test/model_helpers"
11-
. "github.com/onsi/ginkgo"
11+
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
13-
"github.com/tedsuo/ifrit/ginkgomon"
13+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1414
)
1515

1616
var _ = Describe("DesiredLRP API", func() {

‎cmd/bbs/domain_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
77
"code.cloudfoundry.org/diego-logging-client/testhelpers"
88
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
9-
"github.com/tedsuo/ifrit/ginkgomon"
9+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1010

11-
. "github.com/onsi/ginkgo"
11+
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
)
1414

‎cmd/bbs/encryption_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"code.cloudfoundry.org/bbs/models"
66
. "code.cloudfoundry.org/bbs/models/test/matchers"
77
"code.cloudfoundry.org/bbs/models/test/model_helpers"
8-
"github.com/tedsuo/ifrit/ginkgomon"
8+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
99

10-
. "github.com/onsi/ginkgo"
10+
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212
)
1313

‎cmd/bbs/evacuation_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"code.cloudfoundry.org/bbs/events"
66
"code.cloudfoundry.org/bbs/models"
77
"code.cloudfoundry.org/bbs/models/test/model_helpers"
8-
"github.com/tedsuo/ifrit/ginkgomon"
8+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
99

10-
. "github.com/onsi/ginkgo"
10+
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212
)
1313

‎cmd/bbs/event_stream_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
. "code.cloudfoundry.org/bbs/test_helpers"
1212
"code.cloudfoundry.org/diego-logging-client/testhelpers"
1313
"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
14-
"github.com/tedsuo/ifrit/ginkgomon"
14+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1515

16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
)
1919

‎cmd/bbs/logging_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"code.cloudfoundry.org/bbs"
55
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
66

7-
"github.com/tedsuo/ifrit/ginkgomon"
7+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
88

9-
. "github.com/onsi/ginkgo"
9+
. "github.com/onsi/ginkgo/v2"
1010
. "github.com/onsi/gomega"
1111
"github.com/onsi/gomega/gbytes"
1212
)

‎cmd/bbs/lrp_convergence_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"code.cloudfoundry.org/clock"
2020
"code.cloudfoundry.org/diego-logging-client/testhelpers"
2121
"code.cloudfoundry.org/durationjson"
22-
. "github.com/onsi/ginkgo"
22+
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"github.com/tedsuo/ifrit/ginkgomon"
24+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
2525
)
2626

2727
var _ = Describe("Convergence API", func() {

‎cmd/bbs/main_suite_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import (
3131
"code.cloudfoundry.org/locket"
3232
locketconfig "code.cloudfoundry.org/locket/cmd/locket/config"
3333
locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
34-
. "github.com/onsi/ginkgo"
34+
. "github.com/onsi/ginkgo/v2"
3535
. "github.com/onsi/gomega"
3636
"github.com/onsi/gomega/gexec"
3737
"github.com/onsi/gomega/ghttp"
3838
"github.com/tedsuo/ifrit"
39-
"github.com/tedsuo/ifrit/ginkgomon"
39+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
4040

4141
"testing"
4242
"time"

‎cmd/bbs/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main_test
22

33
import (
44
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
5-
. "github.com/onsi/ginkgo"
5+
. "github.com/onsi/ginkgo/v2"
66
. "github.com/onsi/gomega"
77
"github.com/tedsuo/ifrit"
88
)

‎cmd/bbs/master_lock_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"code.cloudfoundry.org/locket/lock"
88
locketmodels "code.cloudfoundry.org/locket/models"
99
"github.com/tedsuo/ifrit"
10-
"github.com/tedsuo/ifrit/ginkgomon"
10+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1111

12-
. "github.com/onsi/ginkgo"
12+
. "github.com/onsi/ginkgo/v2"
1313
. "github.com/onsi/gomega"
1414
)
1515

‎cmd/bbs/metrics_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"code.cloudfoundry.org/locket"
1010
"code.cloudfoundry.org/locket/lock"
1111
locketmodels "code.cloudfoundry.org/locket/models"
12-
. "github.com/onsi/ginkgo"
12+
. "github.com/onsi/ginkgo/v2"
1313
. "github.com/onsi/gomega"
1414
"github.com/tedsuo/ifrit"
15-
"github.com/tedsuo/ifrit/ginkgomon"
15+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1616
)
1717

1818
var _ = Describe("Metrics", func() {

‎cmd/bbs/migration_version_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"code.cloudfoundry.org/bbs/cmd/bbs/testrunner"
1010
"code.cloudfoundry.org/bbs/db/sqldb/helpers"
1111
"code.cloudfoundry.org/bbs/models"
12-
. "github.com/onsi/ginkgo"
12+
. "github.com/onsi/ginkgo/v2"
1313
. "github.com/onsi/gomega"
1414
"github.com/onsi/gomega/gexec"
15-
"github.com/tedsuo/ifrit/ginkgomon"
15+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1616
)
1717

1818
var _ = Describe("Migration Version", func() {

‎cmd/bbs/ping_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"code.cloudfoundry.org/locket/lock"
1010
locketmodels "code.cloudfoundry.org/locket/models"
1111
"github.com/tedsuo/ifrit"
12-
"github.com/tedsuo/ifrit/ginkgomon"
12+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1313

14-
. "github.com/onsi/ginkgo"
14+
. "github.com/onsi/ginkgo/v2"
1515
. "github.com/onsi/gomega"
1616
)
1717

‎cmd/bbs/presence_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
1414
"code.cloudfoundry.org/locket/lock"
1515
locketmodels "code.cloudfoundry.org/locket/models"
16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
"github.com/tedsuo/ifrit"
19-
"github.com/tedsuo/ifrit/ginkgomon"
19+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
2020
)
2121

2222
var _ = Describe("CellPresence", func() {

‎cmd/bbs/secure_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"code.cloudfoundry.org/bbs/models/test/model_helpers"
1111
"code.cloudfoundry.org/tlsconfig"
1212
"github.com/tedsuo/ifrit"
13-
"github.com/tedsuo/ifrit/ginkgomon"
13+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1414

15-
. "github.com/onsi/ginkgo"
15+
. "github.com/onsi/ginkgo/v2"
1616
. "github.com/onsi/gomega"
1717
"github.com/onsi/gomega/ghttp"
1818
)

‎cmd/bbs/sql_lock_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
1515
"code.cloudfoundry.org/locket/lock"
1616
locketmodels "code.cloudfoundry.org/locket/models"
17-
. "github.com/onsi/ginkgo"
17+
. "github.com/onsi/ginkgo/v2"
1818
. "github.com/onsi/gomega"
1919
"github.com/tedsuo/ifrit"
20-
"github.com/tedsuo/ifrit/ginkgomon"
20+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
2121
)
2222

2323
var _ = Describe("SqlLock", func() {

‎cmd/bbs/task_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"code.cloudfoundry.org/bbs/models"
66
. "code.cloudfoundry.org/bbs/models/test/matchers"
77
"code.cloudfoundry.org/bbs/models/test/model_helpers"
8-
"github.com/tedsuo/ifrit/ginkgomon"
8+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
99

10-
. "github.com/onsi/ginkgo"
10+
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212
)
1313

‎cmd/bbs/testrunner/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"code.cloudfoundry.org/durationjson"
1212

1313
. "github.com/onsi/gomega"
14-
"github.com/tedsuo/ifrit/ginkgomon"
14+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1515
)
1616

1717
func New(binPath string, bbsConfig config.BBSConfig) *ginkgomon.Runner {

‎controllers/actual_lrp_lifecycle_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"code.cloudfoundry.org/lager/lagertest"
1616
"code.cloudfoundry.org/rep/repfakes"
1717

18-
. "github.com/onsi/ginkgo"
18+
. "github.com/onsi/ginkgo/v2"
1919
. "github.com/onsi/gomega"
2020
"github.com/onsi/gomega/gbytes"
2121
)

‎controllers/controllers_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"code.cloudfoundry.org/lager"
88
"code.cloudfoundry.org/lager/lagertest"
99
"code.cloudfoundry.org/rep/repfakes"
10-
. "github.com/onsi/ginkgo"
10+
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212

1313
"testing"

‎controllers/evacuation_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"code.cloudfoundry.org/bbs/serviceclient/serviceclientfakes"
1414
"code.cloudfoundry.org/lager/lagertest"
1515
"code.cloudfoundry.org/rep/repfakes"
16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818
"github.com/onsi/gomega/gbytes"
1919
)

‎controllers/lrp_convergence_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"code.cloudfoundry.org/lager/lagertest"
2222
"code.cloudfoundry.org/rep"
2323
"code.cloudfoundry.org/routing-info/internalroutes"
24-
. "github.com/onsi/ginkgo"
24+
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
"github.com/onsi/gomega/gbytes"
2727
)

‎controllers/task_controller_test.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"code.cloudfoundry.org/bbs/taskworkpool/taskworkpoolfakes"
1717
"code.cloudfoundry.org/lager/lagertest"
1818
"code.cloudfoundry.org/rep"
19-
. "github.com/onsi/ginkgo"
19+
. "github.com/onsi/ginkgo/v2"
2020
. "github.com/onsi/gomega"
2121
"github.com/onsi/gomega/gbytes"
2222
)
@@ -661,8 +661,6 @@ var _ = Describe("Task Controller", func() {
661661
BeforeEach(func() {
662662
maxPlacementRetries = 0
663663
})
664-
665-
By("immediately failing the task")
666664
AssertTaskFailing(taskGuid, rejectionReason)
667665

668666
It("rejects the task", func() {
@@ -708,8 +706,6 @@ var _ = Describe("Task Controller", func() {
708706
BeforeEach(func() {
709707
fakeTaskDB.TaskByGuidReturns(&models.Task{RejectionCount: 1}, nil)
710708
})
711-
712-
By("failing the task")
713709
AssertTaskFailing(taskGuid, rejectionReason)
714710

715711
It("rejects the task", func() {
@@ -727,9 +723,8 @@ var _ = Describe("Task Controller", func() {
727723
BeforeEach(func() {
728724
fakeTaskDB.RejectTaskReturns(nil, nil, errors.New("o noes!"))
729725
})
730-
731-
By("it still calls FailTask regardless")
732726
AssertTaskFailing(taskGuid, rejectionReason)
727+
733728
})
734729
})
735730
})

‎converger/converger_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package converger_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
4+
. "github.com/onsi/ginkgo/v2"
55
. "github.com/onsi/gomega"
66

77
"testing"

‎converger/converger_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"code.cloudfoundry.org/lager"
99
"code.cloudfoundry.org/lager/lagertest"
1010
"github.com/tedsuo/ifrit"
11-
"github.com/tedsuo/ifrit/ginkgomon"
11+
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
1212

1313
"code.cloudfoundry.org/bbs/models"
1414
"code.cloudfoundry.org/bbs/serviceclient/serviceclientfakes"
1515
"code.cloudfoundry.org/clock/fakeclock"
16-
. "github.com/onsi/ginkgo"
16+
. "github.com/onsi/ginkgo/v2"
1717
. "github.com/onsi/gomega"
1818

1919
"code.cloudfoundry.org/bbs/converger"

‎db/migrations/1461790966_init_sql_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"code.cloudfoundry.org/bbs/db/migrations"
77
"code.cloudfoundry.org/bbs/migration"
8-
. "github.com/onsi/ginkgo"
8+
. "github.com/onsi/ginkgo/v2"
99
. "github.com/onsi/gomega"
1010
)
1111

‎db/migrations/1471030898_increase_run_info_column_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"code.cloudfoundry.org/bbs/db/migrations"
77
"code.cloudfoundry.org/bbs/db/sqldb/helpers"
88
"code.cloudfoundry.org/bbs/migration"
9-
. "github.com/onsi/ginkgo"
9+
. "github.com/onsi/ginkgo/v2"
1010
. "github.com/onsi/gomega"
1111
)
1212

0 commit comments

Comments
 (0)