Merge pull request #690 from cheftako/extendTimeout

Switching to a longer test timeout.

Author: k8s-ci-robot

tests/concurrent_client_request_test.go

@@ -27,7 +27,7 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/wait"
+	"sigs.k8s.io/apiserver-network-proxy/tests/framework"
 )
 
 type simpleServer struct {
@@ -59,7 +59,7 @@ func getTestClient(front string, t *testing.T) *http.Client {
 		Transport: &http.Transport{
 			DialContext: tunnel.DialContext,
 		},
-		Timeout: wait.ForeverTestTimeout,
+		Timeout: framework.ForeverTestTimeout,
 	}
 }
 

tests/framework/agent.go

@@ -78,7 +78,7 @@ func (*InProcessAgentRunner) Start(t testing.TB, opts AgentOpts) (Agent, error)
 	}()
 
 	healthAddr := net.JoinHostPort(o.HealthServerHost, strconv.Itoa(o.HealthServerPort))
-	if err := wait.PollImmediateWithContext(ctx, 100*time.Millisecond, wait.ForeverTestTimeout, func(context.Context) (bool, error) {
+	if err := wait.PollImmediateWithContext(ctx, 100*time.Millisecond, ForeverTestTimeout, func(context.Context) (bool, error) {
 		return checkLiveness(healthAddr), nil
 	}); err != nil {
 		close(stopCh)
@@ -215,7 +215,7 @@ func (a *externalAgent) Metrics() metricstest.AgentTester {
 }
 
 func (a *externalAgent) waitForLiveness() error {
-	err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) {
+	err := wait.PollImmediate(100*time.Millisecond, ForeverTestTimeout, func() (bool, error) {
 		resp, err := http.Get(fmt.Sprintf("http://%s/healthz", a.healthAddr))
 		if err != nil {
 			return false, nil

tests/framework/proxy_server.go

@@ -73,7 +73,7 @@ func (*InProcessProxyServerRunner) Start(t testing.TB, opts ProxyServerOpts) (Pr
 	}()
 
 	healthAddr := net.JoinHostPort(o.HealthBindAddress, strconv.Itoa(o.HealthPort))
-	if err := wait.PollImmediateWithContext(ctx, 100*time.Millisecond, wait.ForeverTestTimeout, func(context.Context) (bool, error) {
+	if err := wait.PollImmediateWithContext(ctx, 100*time.Millisecond, ForeverTestTimeout, func(context.Context) (bool, error) {
 		return checkLiveness(healthAddr), nil
 	}); err != nil {
 		close(stopCh)

tests/framework/util.go

@@ -21,8 +21,11 @@ import (
 	"net"
 	"net/http"
 	"strconv"
+	"time"
 )
 
+var ForeverTestTimeout = time.Minute
+
 func checkReadiness(addr string) bool {
 	resp, err := http.Get(fmt.Sprintf("http://%s/readyz", addr))
 	if err != nil {

tests/proxy_test.go

@@ -302,7 +302,7 @@ func TestProxyHandle_RequestDeadlineExceeded_GRPC(t *testing.T) {
 		select {
 		case <-tunnel.Done():
 			t.Log("Tunnel closed successfully")
-		case <-time.After(wait.ForeverTestTimeout):
+		case <-time.After(framework.ForeverTestTimeout):
 			t.Errorf("Timed out waiting for tunnel to close")
 		}
 	}()
@@ -352,7 +352,7 @@ func TestProxyDial_RequestCancelled_GRPC(t *testing.T) {
 
 		select {
 		case <-tunnel.Done():
-		case <-time.After(wait.ForeverTestTimeout):
+		case <-time.After(framework.ForeverTestTimeout):
 			t.Errorf("Timed out waiting for tunnel to close")
 		}
 	}()
@@ -415,7 +415,7 @@ func TestProxyDial_RequestCancelled_Concurrent_GRPC(t *testing.T) {
 
 		select {
 		case <-tunnel.Done():
-		case <-time.After(wait.ForeverTestTimeout):
+		case <-time.After(framework.ForeverTestTimeout):
 			t.Errorf("Timed out waiting for tunnel to close")
 		}
 	}
@@ -441,7 +441,7 @@ func TestProxyDial_RequestCancelled_Concurrent_GRPC(t *testing.T) {
 
 	// Wait for the closed connections to propogate
 	var endpointConnsErr, goLeaksErr error
-	wait.PollImmediate(time.Second, wait.ForeverTestTimeout, func() (done bool, err error) {
+	wait.PollImmediate(time.Second, framework.ForeverTestTimeout, func() (done bool, err error) {
 		endpointConnsErr = a.Metrics().ExpectAgentEndpointConnections(0)
 		goLeaksErr = goleak.Find(ignoredGoRoutines...)
 		return endpointConnsErr == nil && goLeaksErr == nil, nil
@@ -503,7 +503,7 @@ func TestProxyDial_AgentTimeout_GRPC(t *testing.T) {
 
 		select {
 		case <-tunnel.Done():
-		case <-time.After(wait.ForeverTestTimeout):
+		case <-time.After(framework.ForeverTestTimeout):
 			t.Errorf("Timed out waiting for tunnel to close")
 		}
 	}()
@@ -979,7 +979,7 @@ func waitForConnectedServerCount(t testing.TB, expectedServerCount int, a framew
 // agents (backends). This assumes the ProxyServer is using a single ProxyStrategy.
 func waitForConnectedAgentCount(t testing.TB, expectedAgentCount int, ps framework.ProxyServer) {
 	t.Helper()
-	err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) {
+	err := wait.PollImmediate(100*time.Millisecond, framework.ForeverTestTimeout, func() (bool, error) {
 		count, err := ps.ConnectedBackends()
 		if err != nil {
 			return false, err