Merge pull request #11728 from a-robinson/isolatedaddr

a-robinson · web-flow · commit 8141dac4107c · 2016-11-30T15:29:23.000-05:00
gossip/simulation: Use IsolatedTestAddr to avoid running out of ports
diff --git a/pkg/gossip/simulation/network.go b/pkg/gossip/simulation/network.go
@@ -104,7 +104,7 @@ func NewNetwork(stopper *stop.Stopper, nodeCount int, createResolvers bool) *Net
 // CreateNode creates a simulation node and starts an RPC server for it.
 func (n *Network) CreateNode() (*Node, error) {
 	server := rpc.NewServer(n.rpcContext)
-	ln, err := net.Listen(util.TestAddr.Network(), util.TestAddr.String())
+	ln, err := net.Listen(util.IsolatedTestAddr.Network(), util.IsolatedTestAddr.String())
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func NewNetwork(stopper stop.Stopper, nodeCount int, createResolvers bool) Net`
`104`	`104`	`// CreateNode creates a simulation node and starts an RPC server for it.`
`105`	`105`	`func (n Network) CreateNode() (Node, error) {`
`106`	`106`	`server := rpc.NewServer(n.rpcContext)`
`107`		`- ln, err := net.Listen(util.TestAddr.Network(), util.TestAddr.String())`
	`107`	`+ ln, err := net.Listen(util.IsolatedTestAddr.Network(), util.IsolatedTestAddr.String())`
`108`	`108`	`if err != nil {`
`109`	`109`	`return nil, err`
`110`	`110`	`}`