Merge pull request #63086 from soltysh/discovery_timeout

Automatic merge from submit-queue (batch tested with PRs 63129, 63066, 60009, 63136, 63086). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix discovery default timeout test /assign @sttts **Release note**: ```release-note NONE ```

Merge pull request #63086 from soltysh/discovery_timeout
a53df4d9 · Kubernetes Submit Queue · GitHub · 81c00aa6 · af2353f8 · a53df4d9
Unverified Commit a53df4d9 authored Apr 25, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

discovery_client_test.go ...g/src/k8s.io/client-go/discovery/discovery_client_test.go +8 -3

No files found.
--- a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go
+++ b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go
@@ -131,18 +131,23 @@ func TestGetServerGroupsWithBrokenServer(t *testing.T) {
 	}
 }
 func TestGetServerGroupsWithTimeout(t *testing.T) {
+	done := make(chan bool)
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		time.Sleep(2 * time.Second)
+		// first we need to write headers, otherwise http client will complain about
+		// exceeding timeout awaiting headers, only after we can block the call
 		w.WriteHeader(http.StatusOK)
+		<-done
 	}))
 	defer server.Close()
+	defer close(done)
 	tmp := defaultTimeout
-	defaultTimeout = 1 * time.Second
+	defaultTimeout = 2 * time.Second
 	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
 	_, err := client.ServerGroups()
-	if err == nil || strings.Contains(err.Error(), "deadline") {
+	if err == nil || !strings.Contains(err.Error(), "deadline") {
 		t.Fatalf("unexpected error: %v", err)
 	}
+	done <- true
 	defaultTimeout = tmp
 }