Refactor testserver to use ci.PortAllocator

hashicorp · Apr 7, 2023 · 4baea90 · 4baea90
1 parent cea6b65
commit 4baea90
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/api/internal/testutil/server.go b/api/internal/testutil/server.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/nomad/api/internal/testutil/discover"
+	"github.com/hashicorp/nomad/ci"
 	testing "github.com/mitchellh/go-testing-interface"
 	"github.com/shoenig/test/must"
-	"github.com/shoenig/test/portal"
 	"github.com/shoenig/test/wait"
 )
 
@@ -104,8 +104,7 @@ type ServerConfigCallback func(c *TestServerConfig)
 // defaultServerConfig returns a new TestServerConfig struct pre-populated with
 // usable config for running as server.
 func defaultServerConfig(t testing.T) *TestServerConfig {
-	grabber := portal.New(t)
-	ports := grabber.Grab(3)
+	ports := ci.PortAllocator.Grab(3)
 
 	logLevel := "ERROR"
 	if envLogLevel := os.Getenv("NOMAD_TEST_LOG_LEVEL"); envLogLevel != "" {