github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Remove long sleeps from proxy tests

Browse Source
This commit is contained in:
Clayton Coleman 2014-08-04 15:35:03 -04:00
parent 786b0399c3
commit 0c33ed09d4
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/proxy/proxier_test.go
View File

@ -27,6 +27,17 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
) )
func waitForClosedPort(p *Proxier, proxyPort string) error {
for i := 0; i < 50; i++ {
_, err := net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort))
if err != nil {
return nil
}
time.Sleep(1 * time.Millisecond)
}
return fmt.Errorf("port %s still open", proxyPort)
}
// a simple echoServer that only accepts one connection. Returns port actually // a simple echoServer that only accepts one connection. Returns port actually
// being listened on, or an error. // being listened on, or an error.
func echoServer(t *testing.T, addr string) (string, error) { func echoServer(t *testing.T, addr string) (string, error) {
@ -107,10 +118,8 @@ func TestProxyStop(t *testing.T) {
p.StopProxy("echo") p.StopProxy("echo")
// Wait for the port to really close. // Wait for the port to really close.
time.Sleep(2 * time.Second) if err := waitForClosedPort(p, proxyPort); err != nil {
_, err = net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort)) t.Fatalf(err.Error())
if err == nil {
t.Fatalf("Unexpected non-error.")
} }
} }
@ -136,11 +145,8 @@ func TestProxyUpdateDelete(t *testing.T) {
conn.Close() conn.Close()
p.OnUpdate([]api.Service{}) p.OnUpdate([]api.Service{})
// Wait for the port to close. if err := waitForClosedPort(p, proxyPort); err != nil {
time.Sleep(2 * time.Second) t.Fatalf(err.Error())
_, err = net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort))
if err == nil {
t.Fatalf("Unexpected non-error.")
} }
} }
@ -167,14 +173,14 @@ func TestProxyUpdatePort(t *testing.T) {
l.Close() l.Close()
// Wait for the socket to actually get free. // Wait for the socket to actually get free.
time.Sleep(2 * time.Second) if err := waitForClosedPort(p, port); err != nil {
t.Fatalf(err.Error())
}
p.OnUpdate([]api.Service{ p.OnUpdate([]api.Service{
{JSONBase: api.JSONBase{ID: "echo"}, Port: portNum}, {JSONBase: api.JSONBase{ID: "echo"}, Port: portNum},
}) })
time.Sleep(2 * time.Second) if err := waitForClosedPort(p, proxyPort); err != nil {
_, err = net.Dial("tcp", net.JoinHostPort("127.0.0.1", proxyPort)) t.Fatalf(err.Error())
if err == nil {
t.Fatalf("Unexpected non-error.")
} }
testEchoConnection(t, "127.0.0.1", port) testEchoConnection(t, "127.0.0.1", port)
} }