kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

move to consul freeport implementation

Browse Source
This commit is contained in:
Alex Dadgar
2017-10-23 16:51:40 -07:00
parent 9b13904159
commit 8accabcd87
12 changed files with 169 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
command/agent/testagent.go
View File

@@ -16,9 +16,9 @@ import (
"github.com/mitchellh/go-testing-interface"
metrics "github.com/armon/go-metrics"
"github.com/hashicorp/consul/lib/freeport"
"github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/client/fingerprint"
"github.com/hashicorp/nomad/helper/freeport"
"github.com/hashicorp/nomad/nomad"
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"
@@ -259,9 +259,10 @@ func (a *TestAgent) Client() *api.Client {
// Instead of relying on one set of ports to be sufficient we retry
// starting the agent with different ports on port conflict.
func (a *TestAgent) pickRandomPorts(c *Config) {
c.Ports.HTTP = freeport.Get(a.T)
c.Ports.RPC = freeport.Get(a.T)
c.Ports.Serf = freeport.Get(a.T)
ports := freeport.GetT(a.T, 3)
c.Ports.HTTP = ports[0]
c.Ports.RPC = ports[1]
c.Ports.Serf = ports[2]
if err := c.normalizeAddrs(); err != nil {
a.T.Fatalf("error normalizing config: %v", err)