fix(tests): fix ReservePort/ReleasePort ordering for NATS runner in 5 test files

Author: hoffmaen

src/code.cloudfoundry.org/gorouter/common/component_test.go

@@ -168,8 +168,8 @@ var _ = Describe("Component", func() {
 
 		BeforeEach(func() {
 			natsPort := test_util.ReservePort()
-			test_util.ReleasePort(natsPort)
 			natsRunner = test_util.NewNATSRunner(int(natsPort))
+			test_util.ReleasePort(natsPort)
 			natsRunner.Start()
 			mbusClient = natsRunner.MessageBus
 			mbusClient.Opts.SkipSubjectValidation = true

src/code.cloudfoundry.org/gorouter/integration/main_test.go

@@ -73,8 +73,8 @@ var _ = Describe("Router Integration", func() {
 		sslPort = test_util.ReservePort()
 		routeServiceServerPort = test_util.ReservePort()
 
-		test_util.ReleasePort(natsPort)
 		natsRunner = test_util.NewNATSRunner(int(natsPort))
+		test_util.ReleasePort(natsPort)
 		natsRunner.Start()
 		oauthServerURL = oauthServer.Addr()
 	})

src/code.cloudfoundry.org/gorouter/integration/nats_test.go

@@ -43,8 +43,8 @@ var _ = Describe("NATS Integration", func() {
 		natsPort = test_util.ReservePort()
 		routeServiceServerPort = test_util.ReservePort()
 
-		test_util.ReleasePort(natsPort)
 		natsRunner = test_util.NewNATSRunner(int(natsPort))
+		test_util.ReleasePort(natsPort)
 		natsRunner.Start()
 	})
 

src/code.cloudfoundry.org/gorouter/mbus/subscriber_test.go

@@ -39,8 +39,8 @@ var _ = Describe("Subscriber", func() {
 
 	BeforeEach(func() {
 		natsPort = test_util.ReservePort()
-		test_util.ReleasePort(natsPort)
 		natsRunner = test_util.NewNATSRunner(int(natsPort))
+		test_util.ReleasePort(natsPort)
 		natsRunner.Start()
 		natsClient = natsRunner.MessageBus
 

src/code.cloudfoundry.org/gorouter/router/router_drain_test.go

@@ -152,8 +152,8 @@ var _ = Describe("Router", func() {
 	BeforeEach(func() {
 		logger = test_util.NewTestLogger("test")
 		natsPort = test_util.ReservePort()
-		test_util.ReleasePort(natsPort)
 		natsRunner = test_util.NewNATSRunner(int(natsPort))
+		test_util.ReleasePort(natsPort)
 		natsRunner.Start()
 
 		proxyPort := test_util.NextAvailPort()