github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed tests.

Browse Source
This commit is contained in:
Brendan Burns 2014-07-30 06:56:42 -07:00
parent 448a4b7d69
commit 9519a8049b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/proxy/proxier.go
View File

@ -156,9 +156,14 @@ func (proxier *Proxier) addService(service string, port int) (net.Listener, erro
return l, nil return l, nil
} }
// used to globally lock around unused ports. Only used in testing.
var unusedPortLock sync.Mutex
// addService starts listening for a new service, returning the port it's using. // addService starts listening for a new service, returning the port it's using.
// For testing on a system with unknown ports used. // For testing on a system with unknown ports used.
func (proxier *Proxier) addServiceOnUnusedPort(service string) (string, error) { func (proxier *Proxier) addServiceOnUnusedPort(service string) (string, error) {
unusedPortLock.Lock()
defer unusedPortLock.Unlock()
// Make sure we can start listening on the port before saying all's well. // Make sure we can start listening on the port before saying all's well.
l, err := net.Listen("tcp", ":0") l, err := net.Listen("tcp", ":0")
if err != nil { if err != nil {

14
pkg/proxy/proxier_test.go
View File

@ -91,7 +91,7 @@ func TestProxyStop(t *testing.T) {
} }
lb := NewLoadBalancerRR() lb := NewLoadBalancerRR()
lb.OnUpdate([]api.Endpoints{{"echo", []string{net.JoinHostPort("127.0.0.1", port)}}}) lb.OnUpdate([]api.Endpoints{{JSONBase: api.JSONBase{ID: "echo"}, Endpoints: []string{net.JoinHostPort("127.0.0.1", port)}}})
p := NewProxier(lb) p := NewProxier(lb)
@ -106,6 +106,7 @@ func TestProxyStop(t *testing.T) {
conn.Close() conn.Close()
p.StopProxy("echo") p.StopProxy("echo")
// Wait for the port to really close.
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
_, err = net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort)) _, err = net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort))
if err == nil { if err == nil {
@ -120,7 +121,7 @@ func TestProxyUpdateDelete(t *testing.T) {
} }
lb := NewLoadBalancerRR() lb := NewLoadBalancerRR()
lb.OnUpdate([]api.Endpoints{{"echo", []string{net.JoinHostPort("127.0.0.1", port)}}}) lb.OnUpdate([]api.Endpoints{{JSONBase: api.JSONBase{ID: "echo"}, Endpoints: []string{net.JoinHostPort("127.0.0.1", port)}}})
p := NewProxier(lb) p := NewProxier(lb)
@ -149,7 +150,7 @@ func TestProxyUpdatePort(t *testing.T) {
} }
lb := NewLoadBalancerRR() lb := NewLoadBalancerRR()
lb.OnUpdate([]api.Endpoints{{"echo", []string{net.JoinHostPort("127.0.0.1", port)}}}) lb.OnUpdate([]api.Endpoints{{JSONBase: api.JSONBase{ID: "echo"}, Endpoints: []string{net.JoinHostPort("127.0.0.1", port)}}})
p := NewProxier(lb) p := NewProxier(lb)
@ -157,11 +158,6 @@ func TestProxyUpdatePort(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("error adding new service: %#v", err) t.Fatalf("error adding new service: %#v", err)
} }
conn, err := net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort))
if err != nil {
t.Fatalf("error connecting to proxy: %v", err)
}
conn.Close()
// add a new dummy listener in order to get a port that is free // add a new dummy listener in order to get a port that is free
l, _ := net.Listen("tcp", ":0") l, _ := net.Listen("tcp", ":0")
@ -169,6 +165,8 @@ func TestProxyUpdatePort(t *testing.T) {
portNum, _ := strconv.Atoi(port) portNum, _ := strconv.Atoi(port)
l.Close() l.Close()
// Wait for the socket to actually get free.
time.Sleep(2 * time.Second)
p.OnUpdate([]api.Service{ p.OnUpdate([]api.Service{
{JSONBase: api.JSONBase{ID: "echo"}, Port: portNum}, {JSONBase: api.JSONBase{ID: "echo"}, Port: portNum},
}) })