Add BeforeSuite in the right place

As part of ginkgo/v2 validations
cloudfoundry · Apr 4, 2023 · 545c651 · 545c651
1 parent 7ad5d75
commit 545c651
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/grpcserver/grpcserver_suite_test.go b/grpcserver/grpcserver_suite_test.go
@@ -1,12 +1,25 @@
 package grpcserver_test
 
 import (
+	"code.cloudfoundry.org/inigo/helpers/portauthority"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
 )
 
+var portAllocator portauthority.PortAllocator
+var _ = BeforeSuite(func() {
+	node := GinkgoParallelProcess()
+	startPort := 1050 * node
+	portRange := 1000
+	endPort := startPort + portRange
+
+	var err error
+	portAllocator, err = portauthority.New(startPort, endPort)
+	Expect(err).NotTo(HaveOccurred())
+})
+
 func TestGrpcserver(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Grpcserver Suite")

diff --git a/grpcserver/server_test.go b/grpcserver/server_test.go
@@ -7,7 +7,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"code.cloudfoundry.org/inigo/helpers/portauthority"
 	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/locket/grpcserver"
 	"code.cloudfoundry.org/locket/models"
@@ -28,20 +27,8 @@ var _ = Describe("GRPCServer", func() {
 		tlsConfig     *tls.Config
 
 		certFixture, keyFixture, caCertFixture string
-		portAllocator                          portauthority.PortAllocator
 	)
 
-	BeforeSuite(func() {
-		node := GinkgoParallelProcess()
-		startPort := 1050 * node
-		portRange := 1000
-		endPort := startPort + portRange
-
-		var err error
-		portAllocator, err = portauthority.New(startPort, endPort)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
 	BeforeEach(func() {
 		var err error