mirror of https://github.com/k3s-io/k3s
Merge pull request #63875 from deads2k/client-10-timeout
Automatic merge from submit-queue (batch tested with PRs 63875, 63817). 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>. make TestGetServerGroupsWithTimeout more reliable Stops overriding a global variable in a test and tolerates a different kind of timeout message you can see. /assign @soltyshpull/8/head
commit
baad3d4159
|
@ -136,20 +136,26 @@ func TestGetServerGroupsWithTimeout(t *testing.T) {
|
||||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
// first we need to write headers, otherwise http client will complain about
|
// first we need to write headers, otherwise http client will complain about
|
||||||
// exceeding timeout awaiting headers, only after we can block the call
|
// exceeding timeout awaiting headers, only after we can block the call
|
||||||
w.WriteHeader(http.StatusOK)
|
w.Header().Set("Connection", "keep-alive")
|
||||||
|
if wf, ok := w.(http.Flusher); ok {
|
||||||
|
wf.Flush()
|
||||||
|
}
|
||||||
<-done
|
<-done
|
||||||
}))
|
}))
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
defer close(done)
|
defer close(done)
|
||||||
tmp := defaultTimeout
|
client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL, Timeout: 2 * time.Second})
|
||||||
defaultTimeout = 2 * time.Second
|
|
||||||
client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
|
|
||||||
_, err := client.ServerGroups()
|
_, err := client.ServerGroups()
|
||||||
if err == nil || !strings.Contains(err.Error(), "deadline") {
|
// the error we're getting here is wrapped in errors.errorString which makes
|
||||||
|
// it impossible to unwrap and check it's attributes, so instead we're checking
|
||||||
|
// the textual output which is presenting http.httpError with timeout set to true
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("missing error")
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "timeout:true") &&
|
||||||
|
!strings.Contains(err.Error(), "context.deadlineExceededError") {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
done <- true
|
|
||||||
defaultTimeout = tmp
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetServerResourcesWithV1Server(t *testing.T) {
|
func TestGetServerResourcesWithV1Server(t *testing.T) {
|
||||||
|
|
Loading…
Reference in New Issue