Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

netutil: use "context" and ctx-ize TCP addr resolution

Browse Source
This commit is contained in:
Anthony Romano
2017-04-21 09:59:34 -07:00
parent 8bad78cb98
commit 85e87e8f6b
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/netutil/netutil_test.go
View File

@@ -15,6 +15,7 @@
package netutil
import (
"context"
"errors"
"net"
"net/url"
@@ -22,12 +23,10 @@ import (
"strconv"
"testing"
"time"
"golang.org/x/net/context"
)
func TestResolveTCPAddrs(t *testing.T) {
defer func() { resolveTCPAddr = net.ResolveTCPAddr }()
defer func() { resolveTCPAddr = resolveTCPAddrDefault }()
tests := []struct {
urls [][]url.URL
expected [][]url.URL
@@ -113,7 +112,7 @@ func TestResolveTCPAddrs(t *testing.T) {
},
}
for _, tt := range tests {
resolveTCPAddr = func(network, addr string) (*net.TCPAddr, error) {
resolveTCPAddr = func(ctx context.Context, addr string) (*net.TCPAddr, error) {
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
@@ -143,13 +142,13 @@ func TestResolveTCPAddrs(t *testing.T) {
}
func TestURLsEqual(t *testing.T) {
defer func() { resolveTCPAddr = net.ResolveTCPAddr }()
defer func() { resolveTCPAddr = resolveTCPAddrDefault }()
hostm := map[string]string{
"example.com": "10.0.10.1",
"first.com": "10.0.11.1",
"second.com": "10.0.11.2",
}
resolveTCPAddr = func(network, addr string) (*net.TCPAddr, error) {
resolveTCPAddr = func(ctx context.Context, addr string) (*net.TCPAddr, error) {
host, port, herr := net.SplitHostPort(addr)
if herr != nil {
return nil, herr