mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #91566 from RainbowMango/pr_fix_invalid_recover_in_apiserver
Fix a wrong usage of recover in apiserver
This commit is contained in:
commit
ae1103726f
@ -63,7 +63,7 @@ type Reader struct {
|
|||||||
protocols map[string]ReaderProtocolConfig
|
protocols map[string]ReaderProtocolConfig
|
||||||
selectedProtocol string
|
selectedProtocol string
|
||||||
|
|
||||||
handleCrash func() // overridable for testing
|
handleCrash func(additionalHandlers ...func(interface{})) // overridable for testing
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewReader creates a WebSocket pipe that will copy the contents of r to a provided
|
// NewReader creates a WebSocket pipe that will copy the contents of r to a provided
|
||||||
@ -78,7 +78,7 @@ func NewReader(r io.Reader, ping bool, protocols map[string]ReaderProtocolConfig
|
|||||||
err: make(chan error),
|
err: make(chan error),
|
||||||
ping: ping,
|
ping: ping,
|
||||||
protocols: protocols,
|
protocols: protocols,
|
||||||
handleCrash: func() { runtime.HandleCrash() },
|
handleCrash: runtime.HandleCrash,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -169,7 +169,7 @@ func TestStreamSurvivesPanic(t *testing.T) {
|
|||||||
r := NewReader(errs, false, NewDefaultReaderProtocols())
|
r := NewReader(errs, false, NewDefaultReaderProtocols())
|
||||||
|
|
||||||
// do not call runtime.HandleCrash() in handler. Otherwise, the tests are interrupted.
|
// do not call runtime.HandleCrash() in handler. Otherwise, the tests are interrupted.
|
||||||
r.handleCrash = func() { recover() }
|
r.handleCrash = func(additionalHandlers ...func(interface{})) { recover() }
|
||||||
|
|
||||||
data, err := readWebSocket(r, t, nil)
|
data, err := readWebSocket(r, t, nil)
|
||||||
if !reflect.DeepEqual(data, []byte(input)) {
|
if !reflect.DeepEqual(data, []byte(input)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user