From 1da2eaba5a9035aecaa3eeb80df559b59b94287d Mon Sep 17 00:00:00 2001 From: Rui Yang Date: Sat, 11 Mar 2023 00:11:21 -0500 Subject: [PATCH] continue update test syntax for ginkgo v2 - remove ginkgo v1 reference - remove deprecated ginkgo table import - replace GinkgoParallelNode with GinkgoParallelProcess - bump ginkgo v2 to latest v2.9 - fix an error "flag redefined ginkgo.seed". See more in https://github.com/onsi/ginkgo/issues/875#issuecomment-1036350659 Signed-off-by: Rui Yang Signed-off-by: Konstantin Troshin --- atc/api/accessor/accessor_test.go | 1 - atc/creds/conjur/manager_test.go | 1 - atc/creds/kubernetes/kubernetes_test.go | 1 - atc/creds/load_var_plan_test.go | 2 +- atc/creds/secretsmanager/manager_test.go | 1 - atc/creds/ssm/manager_test.go | 1 - atc/creds/vault/manager_test.go | 1 - atc/db/build_factory_test.go | 1 - atc/db/notifications_bus_test.go | 5 +- atc/db/worker_lifecycle_test.go | 1 - atc/db/worker_resource_caches_test.go | 5 +- atc/db/worker_test.go | 1 - atc/event/parser_test.go | 1 - atc/integration/integration_suite_test.go | 2 +- atc/integration/rbac_test.go | 2 +- atc/metric/emitter/newrelic_test.go | 1 - atc/postgresrunner/ginkgo.go | 2 +- atc/scheduler/algorithm/algorithm_test.go | 2 +- atc/scheduler/algorithm/migration_test.go | 2 +- atc/scheduler/algorithm/regression_test.go | 2 +- atc/scheduler/job_scheduling_test.go | 2 +- cmd/concourse/concourse_test.go | 8 +-- fly/README.md | 2 +- fly/integration/error_handling_test.go | 1 - fly/scripts/test | 2 +- go.mod | 21 ++++---- go.sum | 52 +++++++------------ skymarshal/dexserver/dexserver_test.go | 2 +- skymarshal/skycmd/flags_test.go | 1 - testflight/suite_test.go | 2 +- topgun/common/common.go | 2 +- topgun/k8s/k8s_suite_test.go | 4 +- tsa/cmd/tsa/suite_test.go | 6 +-- tsa/scripts/test | 2 +- .../api/volume_server_linux_test.go | 2 +- .../baggageclaim/privileges_test.go | 2 +- .../integration/baggageclaim/startup_test.go | 2 +- .../integration/baggageclaim/suite_test.go | 6 +-- worker/baggageclaim/scripts/test | 2 +- 39 files changed, 66 insertions(+), 90 deletions(-) diff --git a/atc/api/accessor/accessor_test.go b/atc/api/accessor/accessor_test.go index 07fbe4bdf3d..c509b372512 100644 --- a/atc/api/accessor/accessor_test.go +++ b/atc/api/accessor/accessor_test.go @@ -2,7 +2,6 @@ package accessor_test import ( "github.com/concourse/concourse/atc/atcfakes" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/atc/creds/conjur/manager_test.go b/atc/creds/conjur/manager_test.go index 235349192e7..cc21a61634c 100644 --- a/atc/creds/conjur/manager_test.go +++ b/atc/creds/conjur/manager_test.go @@ -4,7 +4,6 @@ import ( "github.com/concourse/concourse/atc/creds/conjur" "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/creds/kubernetes/kubernetes_test.go b/atc/creds/kubernetes/kubernetes_test.go index d4d3557c2ab..5b0e9c881f3 100644 --- a/atc/creds/kubernetes/kubernetes_test.go +++ b/atc/creds/kubernetes/kubernetes_test.go @@ -8,7 +8,6 @@ import ( "github.com/concourse/concourse/atc/creds" "github.com/concourse/concourse/atc/creds/kubernetes" "github.com/concourse/concourse/vars" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/atc/creds/load_var_plan_test.go b/atc/creds/load_var_plan_test.go index 5f8f1e03dde..d5a7deaa57e 100644 --- a/atc/creds/load_var_plan_test.go +++ b/atc/creds/load_var_plan_test.go @@ -5,7 +5,7 @@ import ( "github.com/concourse/concourse/atc/creds" "github.com/concourse/concourse/vars" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/creds/secretsmanager/manager_test.go b/atc/creds/secretsmanager/manager_test.go index fb04d706399..aada71dfc7d 100644 --- a/atc/creds/secretsmanager/manager_test.go +++ b/atc/creds/secretsmanager/manager_test.go @@ -4,7 +4,6 @@ import ( "github.com/concourse/concourse/atc/creds/secretsmanager" "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/creds/ssm/manager_test.go b/atc/creds/ssm/manager_test.go index 386ccb393da..b1f4733137e 100644 --- a/atc/creds/ssm/manager_test.go +++ b/atc/creds/ssm/manager_test.go @@ -4,7 +4,6 @@ import ( "github.com/concourse/concourse/atc/creds/ssm" flags "github.com/jessevdk/go-flags" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/creds/vault/manager_test.go b/atc/creds/vault/manager_test.go index 816db16529e..b205aa5d6b3 100644 --- a/atc/creds/vault/manager_test.go +++ b/atc/creds/vault/manager_test.go @@ -14,7 +14,6 @@ import ( "github.com/jessevdk/go-flags" "github.com/square/certstrap/pkix" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/db/build_factory_test.go b/atc/db/build_factory_test.go index 6fcd441da0e..dba7d22c0d9 100644 --- a/atc/db/build_factory_test.go +++ b/atc/db/build_factory_test.go @@ -7,7 +7,6 @@ import ( "code.cloudfoundry.org/lager/lagerctx" "github.com/concourse/concourse/atc" "github.com/concourse/concourse/atc/db" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/atc/db/notifications_bus_test.go b/atc/db/notifications_bus_test.go index a2083d75338..d9ac767bf9f 100644 --- a/atc/db/notifications_bus_test.go +++ b/atc/db/notifications_bus_test.go @@ -376,8 +376,7 @@ var _ = Describe("NotificationBus", func() { Expect(err).NotTo(HaveOccurred()) close(done) - }, 5) - + }) }) Context("when the notification channel fills up while unlistening", func() { @@ -400,7 +399,7 @@ var _ = Describe("NotificationBus", func() { Expect(err).NotTo(HaveOccurred()) close(done) - }, 5) + }) }) }) }) diff --git a/atc/db/worker_lifecycle_test.go b/atc/db/worker_lifecycle_test.go index 4ca1bcaab32..bd483fe014f 100644 --- a/atc/db/worker_lifecycle_test.go +++ b/atc/db/worker_lifecycle_test.go @@ -6,7 +6,6 @@ import ( "github.com/concourse/concourse/atc" "github.com/concourse/concourse/atc/db" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/db/worker_resource_caches_test.go b/atc/db/worker_resource_caches_test.go index 5dcfb6a8897..78b3b7d77bf 100644 --- a/atc/db/worker_resource_caches_test.go +++ b/atc/db/worker_resource_caches_test.go @@ -1,12 +1,13 @@ package db_test import ( + "time" + "github.com/concourse/concourse/atc" "github.com/concourse/concourse/atc/db" "github.com/concourse/concourse/atc/db/dbtest" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "time" ) var _ = Describe("WorkerResourceCaches", func() { diff --git a/atc/db/worker_test.go b/atc/db/worker_test.go index 05c37872ed3..11ad8b7e094 100644 --- a/atc/db/worker_test.go +++ b/atc/db/worker_test.go @@ -8,7 +8,6 @@ import ( "github.com/concourse/concourse/atc" . "github.com/concourse/concourse/atc/db" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/atc/event/parser_test.go b/atc/event/parser_test.go index 19ea77c15e9..84875a1ff54 100644 --- a/atc/event/parser_test.go +++ b/atc/event/parser_test.go @@ -3,7 +3,6 @@ package event_test import ( "github.com/concourse/concourse/atc" "github.com/concourse/concourse/atc/event" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/atc/integration/integration_suite_test.go b/atc/integration/integration_suite_test.go index be638ecf40f..aa211ca39cb 100644 --- a/atc/integration/integration_suite_test.go +++ b/atc/integration/integration_suite_test.go @@ -61,7 +61,7 @@ var _ = BeforeEach(func() { cmd.Server.ClientSecret = "client-secret" cmd.Logger.LogLevel = "debug" cmd.Logger.SetWriterSink(GinkgoWriter) - cmd.BindPort = 9090 + uint16(GinkgoParallelNode()) + cmd.BindPort = 9090 + uint16(GinkgoParallelProcess()) cmd.DebugBindPort = 0 signingKey, err := rsa.GenerateKey(rand.Reader, 1024) diff --git a/atc/integration/rbac_test.go b/atc/integration/rbac_test.go index b2a7dfddb6f..2057f7a90cb 100644 --- a/atc/integration/rbac_test.go +++ b/atc/integration/rbac_test.go @@ -151,7 +151,7 @@ jobs: BeforeEach(func() { var err error - tmp, err = ioutil.TempDir("", fmt.Sprintf("tmp-%d", GinkgoParallelNode())) + tmp, err = ioutil.TempDir("", fmt.Sprintf("tmp-%d", GinkgoParallelProcess())) Expect(err).ToNot(HaveOccurred()) }) diff --git a/atc/metric/emitter/newrelic_test.go b/atc/metric/emitter/newrelic_test.go index c031935861d..e38ca01d3e7 100644 --- a/atc/metric/emitter/newrelic_test.go +++ b/atc/metric/emitter/newrelic_test.go @@ -12,7 +12,6 @@ import ( "github.com/concourse/concourse/atc/metric" "github.com/concourse/concourse/atc/metric/emitter" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/ghttp" diff --git a/atc/postgresrunner/ginkgo.go b/atc/postgresrunner/ginkgo.go index d2086cc9da7..c357eba8732 100644 --- a/atc/postgresrunner/ginkgo.go +++ b/atc/postgresrunner/ginkgo.go @@ -28,7 +28,7 @@ func GinkgoRunner(runner *Runner) none { func InitializeRunnerForGinkgo(runner *Runner, dbProcess *ifrit.Process) { *runner = Runner{ - Port: 5433 + GinkgoParallelNode(), + Port: 5433 + GinkgoParallelProcess(), } *dbProcess = ifrit.Invoke(*runner) runner.InitializeTestDBTemplate() diff --git a/atc/scheduler/algorithm/algorithm_test.go b/atc/scheduler/algorithm/algorithm_test.go index 96d27c87bcc..145ed6446ec 100644 --- a/atc/scheduler/algorithm/algorithm_test.go +++ b/atc/scheduler/algorithm/algorithm_test.go @@ -1,7 +1,7 @@ package algorithm_test import ( - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" ) var _ = DescribeTable("Input resolving", diff --git a/atc/scheduler/algorithm/migration_test.go b/atc/scheduler/algorithm/migration_test.go index 911ab58cc7f..4887829d887 100644 --- a/atc/scheduler/algorithm/migration_test.go +++ b/atc/scheduler/algorithm/migration_test.go @@ -6,7 +6,7 @@ import ( "encoding/json" "github.com/concourse/concourse/atc" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" ) // NOTE: The purpose of these tests are to test the migration of build inputs diff --git a/atc/scheduler/algorithm/regression_test.go b/atc/scheduler/algorithm/regression_test.go index e1cdcf334a9..d1367e02165 100644 --- a/atc/scheduler/algorithm/regression_test.go +++ b/atc/scheduler/algorithm/regression_test.go @@ -2,7 +2,7 @@ package algorithm_test import ( "github.com/concourse/concourse/atc/db" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" ) var _ = DescribeTable("Regression tests", diff --git a/atc/scheduler/job_scheduling_test.go b/atc/scheduler/job_scheduling_test.go index 9a52775ab60..755514ab800 100644 --- a/atc/scheduler/job_scheduling_test.go +++ b/atc/scheduler/job_scheduling_test.go @@ -10,7 +10,7 @@ import ( "github.com/concourse/concourse/atc/db/dbfakes" "github.com/concourse/concourse/atc/scheduler" "github.com/concourse/concourse/atc/scheduler/schedulerfakes" - . "github.com/onsi/ginkgo/extensions/table" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/cmd/concourse/concourse_test.go b/cmd/concourse/concourse_test.go index bf7e33d79ae..f596b404875 100644 --- a/cmd/concourse/concourse_test.go +++ b/cmd/concourse/concourse_test.go @@ -48,12 +48,12 @@ var _ = Describe("Web Command", func() { "--tsa-host-key", hostKeyFile, "--postgres-user", "postgres", "--postgres-database", "testdb", - "--postgres-port", strconv.Itoa(5433+GinkgoParallelNode()), + "--postgres-port", strconv.Itoa(5433+GinkgoParallelProcess()), "--main-team-local-user", "test", "--add-local-user", "test:test", - "--debug-bind-port", strconv.Itoa(8000+GinkgoParallelNode()), - "--bind-port", strconv.Itoa(8080+GinkgoParallelNode()), - "--tsa-bind-port", strconv.Itoa(2222+GinkgoParallelNode()), + "--debug-bind-port", strconv.Itoa(8000+GinkgoParallelProcess()), + "--bind-port", strconv.Itoa(8080+GinkgoParallelProcess()), + "--tsa-bind-port", strconv.Itoa(2222+GinkgoParallelProcess()), "--client-id", "client-id", "--client-secret", "client-secret", "--tsa-client-id", "tsa-client-id", diff --git a/fly/README.md b/fly/README.md index 9eda0fdb122..ff1f57b1311 100644 --- a/fly/README.md +++ b/fly/README.md @@ -34,7 +34,7 @@ Fly is built using [Go](http://golang.org/). Building and testing fly is most ea 3. You can also now run tests by installing and running [ginkgo](http://onsi.github.io/ginkgo/): ```bash - go get github.com/onsi/ginkgo/ginkgo + go get github.com/onsi/ginkgo/v2/ginkgo ginkgo -r ``` diff --git a/fly/integration/error_handling_test.go b/fly/integration/error_handling_test.go index 68a326075e2..7bd396c4b09 100644 --- a/fly/integration/error_handling_test.go +++ b/fly/integration/error_handling_test.go @@ -5,7 +5,6 @@ import ( "net/http" "os/exec" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/fly/scripts/test b/fly/scripts/test index 172831a86f8..910a15c4d0a 100755 --- a/fly/scripts/test +++ b/fly/scripts/test @@ -8,7 +8,7 @@ not_installed() { if not_installed ginkgo; then echo "# ginkgo is not installed! run the following command:" - echo " go install github.com/onsi/ginkgo/ginkgo" + echo " go install github.com/onsi/ginkgo/v2/ginkgo" exit 1 fi diff --git a/go.mod b/go.mod index b20c1e94c6f..3586f38b692 100644 --- a/go.mod +++ b/go.mod @@ -55,9 +55,8 @@ require ( github.com/miekg/dns v1.1.50 github.com/mitchellh/mapstructure v1.5.0 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.6.1 - github.com/onsi/gomega v1.24.2 + github.com/onsi/ginkgo/v2 v2.9.0 + github.com/onsi/gomega v1.27.1 github.com/opencontainers/runc v1.1.4 github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 github.com/patrickmn/go-cache v2.1.0+incompatible @@ -87,7 +86,7 @@ require ( golang.org/x/crypto v0.5.0 golang.org/x/oauth2 v0.3.0 golang.org/x/sync v0.1.0 - golang.org/x/sys v0.4.0 + golang.org/x/sys v0.5.0 golang.org/x/time v0.3.0 google.golang.org/grpc v1.51.0 gopkg.in/square/go-jose.v2 v2.6.0 @@ -189,11 +188,11 @@ require ( go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/mod v0.7.0 // indirect - golang.org/x/net v0.5.0 // indirect - golang.org/x/term v0.4.0 // indirect - golang.org/x/text v0.6.0 // indirect - golang.org/x/tools v0.5.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect + golang.org/x/tools v0.6.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.99.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -227,12 +226,14 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect + github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/pierrec/lz4 v2.6.0+incompatible // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/spf13/cast v1.4.1 // indirect @@ -240,3 +241,5 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/exp v0.0.0-20221004215720-b9f4876ce741 // indirect ) + +replace github.com/onsi/ginkgo => github.com/phil9909/ginkgo v1.16.6-0.20220211153547-67da0e38b07d diff --git a/go.sum b/go.sum index f5f34ba5892..67319685aa9 100644 --- a/go.sum +++ b/go.sum @@ -602,6 +602,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -871,30 +872,16 @@ github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q= -github.com/onsi/ginkgo/v2 v2.6.1/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo= +github.com/onsi/ginkgo/v2 v2.9.0 h1:Tugw2BKlNHTMfG+CheOITkYvk4LAh6MFOvikhGVnhE8= +github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -905,8 +892,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/onsi/gomega v1.24.2 h1:J/tulyYK6JwBldPViHJReihxxZ+22FHs0piGjQAvoUE= -github.com/onsi/gomega v1.24.2/go.mod h1:gs3J10IS7Z7r7eXRoNJIrNqU4ToQukCJhFtKrWgHWnk= +github.com/onsi/gomega v1.27.1 h1:rfztXRbg6nv/5f+Raen9RcGoSecHIFgBBLQK3Wdj754= +github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfadcIAw= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -949,6 +936,8 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterhellberg/link v1.2.0 h1:UA5pg3Gp/E0F2WdX7GERiNrPQrM1K6CVJUUWfHa4t6c= github.com/peterhellberg/link v1.2.0/go.mod h1:gYfAh+oJgQu2SrZHg5hROVRQe1ICoK0/HHJTcE0edxc= +github.com/phil9909/ginkgo v1.16.6-0.20220211153547-67da0e38b07d h1:DIoStlje2U4oPJgnqglov0q5+f9FiCSu8VeFzhpmVlc= +github.com/phil9909/ginkgo v1.16.6-0.20220211153547-67da0e38b07d/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -1023,7 +1012,6 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= @@ -1243,8 +1231,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1309,8 +1297,8 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1374,7 +1362,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1402,7 +1389,6 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1468,14 +1454,14 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1486,8 +1472,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1562,8 +1548,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= -golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/skymarshal/dexserver/dexserver_test.go b/skymarshal/dexserver/dexserver_test.go index 6d90a263207..bd61fbff8fb 100644 --- a/skymarshal/dexserver/dexserver_test.go +++ b/skymarshal/dexserver/dexserver_test.go @@ -29,7 +29,7 @@ var _ = Describe("Dex Server", func() { storage, err = store.NewPostgresStorage(logger, flag.PostgresConfig{ Host: "127.0.0.1", - Port: uint16(5433 + GinkgoParallelNode()), + Port: uint16(5433 + GinkgoParallelProcess()), User: "postgres", SSLMode: "disable", Database: "testdb", diff --git a/skymarshal/skycmd/flags_test.go b/skymarshal/skycmd/flags_test.go index f25550cb46c..1ea8f92b4ed 100644 --- a/skymarshal/skycmd/flags_test.go +++ b/skymarshal/skycmd/flags_test.go @@ -6,7 +6,6 @@ import ( "github.com/concourse/concourse/atc" "github.com/concourse/concourse/skymarshal/skycmd" - . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/testflight/suite_test.go b/testflight/suite_test.go index c1cec1c12fc..4e7c47a06a1 100644 --- a/testflight/suite_test.go +++ b/testflight/suite_test.go @@ -184,7 +184,7 @@ func randomPipelineName() string { guid, err := uuid.NewV4() Expect(err).ToNot(HaveOccurred()) - return fmt.Sprintf("%s-%d-%s", pipelinePrefix, GinkgoParallelNode(), guid) + return fmt.Sprintf("%s-%d-%s", pipelinePrefix, GinkgoParallelProcess(), guid) } func fly(argv ...string) *gexec.Session { diff --git a/topgun/common/common.go b/topgun/common/common.go index 81ec649437d..c5f3f99be8e 100644 --- a/topgun/common/common.go +++ b/topgun/common/common.go @@ -129,7 +129,7 @@ var _ = BeforeEach(func() { backupAndRestoreReleaseVersion = "latest" } - deploymentNumber := GinkgoParallelNode() + deploymentNumber := GinkgoParallelProcess() DeploymentName = fmt.Sprintf("%s-%d", deploymentNamePrefix, deploymentNumber) Fly.Target = DeploymentName diff --git a/topgun/k8s/k8s_suite_test.go b/topgun/k8s/k8s_suite_test.go index cea16f884af..9ecc95dd2cb 100644 --- a/topgun/k8s/k8s_suite_test.go +++ b/topgun/k8s/k8s_suite_test.go @@ -91,8 +91,8 @@ var _ = BeforeEach(func() { fly = FlyCli{ Bin: Environment.FlyPath, - Target: "concourse-topgun-k8s-" + strconv.Itoa(GinkgoParallelNode()), - Home: filepath.Join(tmp, "fly-home-"+strconv.Itoa(GinkgoParallelNode())), + Target: "concourse-topgun-k8s-" + strconv.Itoa(GinkgoParallelProcess()), + Home: filepath.Join(tmp, "fly-home-"+strconv.Itoa(GinkgoParallelProcess())), } endpointFactory = PortForwardingEndpointFactory{} diff --git a/tsa/cmd/tsa/suite_test.go b/tsa/cmd/tsa/suite_test.go index de1e24c068a..7095867fda5 100644 --- a/tsa/cmd/tsa/suite_test.go +++ b/tsa/cmd/tsa/suite_test.go @@ -85,10 +85,10 @@ var ( ) var _ = BeforeEach(func() { - tsaPort = 9800 + GinkgoParallelNode() - tsaDebugPort = 9900 + GinkgoParallelNode() + tsaPort = 9800 + GinkgoParallelProcess() + tsaDebugPort = 9900 + GinkgoParallelProcess() - gardenPort := 9001 + GinkgoParallelNode() + gardenPort := 9001 + GinkgoParallelProcess() gardenAddr = fmt.Sprintf("127.0.0.1:%d", gardenPort) fakeBackend = new(gfakes.FakeBackend) diff --git a/tsa/scripts/test b/tsa/scripts/test index 1678890ba30..58c424399d2 100755 --- a/tsa/scripts/test +++ b/tsa/scripts/test @@ -10,7 +10,7 @@ tsa_dir=$(cd $(dirname $(dirname $0)) && pwd) if not_installed ginkgo; then echo "# ginkgo is not installed! run the following command:" - echo " go install github.com/onsi/ginkgo/ginkgo" + echo " go install github.com/onsi/ginkgo/v2/ginkgo" exit 1 fi diff --git a/worker/baggageclaim/api/volume_server_linux_test.go b/worker/baggageclaim/api/volume_server_linux_test.go index 0069f0e339e..ce8e0075e80 100644 --- a/worker/baggageclaim/api/volume_server_linux_test.go +++ b/worker/baggageclaim/api/volume_server_linux_test.go @@ -40,7 +40,7 @@ var _ = Describe("Volume Server", func() { BeforeEach(func() { var err error - tempDir, err = ioutil.TempDir("", fmt.Sprintf("baggageclaim_volume_dir_%d", GinkgoParallelNode())) + tempDir, err = ioutil.TempDir("", fmt.Sprintf("baggageclaim_volume_dir_%d", GinkgoParallelProcess())) Expect(err).NotTo(HaveOccurred()) // ioutil.TempDir creates it 0700; we need public readability for diff --git a/worker/baggageclaim/integration/baggageclaim/privileges_test.go b/worker/baggageclaim/integration/baggageclaim/privileges_test.go index 2eb96c6ae36..e6ff849b065 100644 --- a/worker/baggageclaim/integration/baggageclaim/privileges_test.go +++ b/worker/baggageclaim/integration/baggageclaim/privileges_test.go @@ -50,7 +50,7 @@ var _ = Describe("Privileges", func() { makeSentinel := func(volumePath string) string { sentinel, err := ioutil.TempFile("", - fmt.Sprintf("baggageclaim_link_sentinel_%d", GinkgoParallelNode())) + fmt.Sprintf("baggageclaim_link_sentinel_%d", GinkgoParallelProcess())) Expect(err).NotTo(HaveOccurred()) diff --git a/worker/baggageclaim/integration/baggageclaim/startup_test.go b/worker/baggageclaim/integration/baggageclaim/startup_test.go index 009304df981..d0529d7f67a 100644 --- a/worker/baggageclaim/integration/baggageclaim/startup_test.go +++ b/worker/baggageclaim/integration/baggageclaim/startup_test.go @@ -21,7 +21,7 @@ var _ = Describe("Startup", func() { }) It("exits with an error if --volumes is not specified", func() { - port := 7788 + GinkgoParallelNode() + port := 7788 + GinkgoParallelProcess() command := exec.Command( baggageClaimPath, diff --git a/worker/baggageclaim/integration/baggageclaim/suite_test.go b/worker/baggageclaim/integration/baggageclaim/suite_test.go index 339efac7b96..08fbb6f523c 100644 --- a/worker/baggageclaim/integration/baggageclaim/suite_test.go +++ b/worker/baggageclaim/integration/baggageclaim/suite_test.go @@ -77,9 +77,9 @@ type BaggageClaimRunner struct { } func NewRunner(path string, driver string) *BaggageClaimRunner { - port := 7788 + GinkgoParallelNode() + port := 7788 + GinkgoParallelProcess() - volumeDir, err := ioutil.TempDir("", fmt.Sprintf("baggageclaim_volume_dir_%d", GinkgoParallelNode())) + volumeDir, err := ioutil.TempDir("", fmt.Sprintf("baggageclaim_volume_dir_%d", GinkgoParallelProcess())) Expect(err).NotTo(HaveOccurred()) err = os.Mkdir(filepath.Join(volumeDir, "overlays"), 0700) @@ -99,7 +99,7 @@ func (bcr *BaggageClaimRunner) Start() { Command: exec.Command( bcr.path, "--bind-port", strconv.Itoa(bcr.port), - "--debug-bind-port", strconv.Itoa(8099+GinkgoParallelNode()), + "--debug-bind-port", strconv.Itoa(8099+GinkgoParallelProcess()), "--volumes", bcr.volumeDir, "--driver", bcr.driver, "--overlays-dir", filepath.Join(bcr.volumeDir, "overlays"), diff --git a/worker/baggageclaim/scripts/test b/worker/baggageclaim/scripts/test index 14ea112c4da..d7d6ec948bd 100755 --- a/worker/baggageclaim/scripts/test +++ b/worker/baggageclaim/scripts/test @@ -10,7 +10,7 @@ baggageclaim_dir=$(realpath $(dirname $(dirname $0))) if not_installed ginkgo; then echo "# ginkgo is not installed! run the following command:" - echo " go install github.com/onsi/ginkgo/ginkgo" + echo " go install github.com/onsi/ginkgo/v2/ginkgo" exit 1 fi