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

use subtests and defer in TestSPDYExecutorStream

Browse Source 
Signed-off-by: arkbriar <arkbriar@gmail.com>
This commit is contained in:
arkbriar 2022-10-10 11:24:40 +08:00
parent 42808c8343
commit 86e5d069ec
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
staging/src/k8s.io/client-go/tools/remotecommand/remotecommand_test.go
View File

@ -157,29 +157,27 @@ func TestSPDYExecutorStream(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
server := newTestHTTPServer(test.attacher, &test.options) t.Run(test.name, func(t *testing.T) {
server := newTestHTTPServer(test.attacher, &test.options)
defer server.Close()
ctx, cancelFn := context.Background(), func() {} ctx, cancel := context.Background(), func() {}
if test.timeout > 0 { if test.timeout > 0 {
ctx, cancelFn = context.WithTimeout(ctx, test.timeout) ctx, cancel = context.WithTimeout(ctx, test.timeout)
} }
defer cancel()
err := func(ctx context.Context, cancel context.CancelFunc) error { err := attach2Server(ctx, server.URL, test.options)
defer cancelFn()
return attach2Server(ctx, server.URL, test.options)
}(ctx, cancelFn)
gotError := "" gotError := ""
if err != nil { if err != nil {
gotError = err.Error() gotError = err.Error()
} }
if test.expectError != gotError { if test.expectError != gotError {
t.Errorf("%s: expected [%v], got [%v]", test.name, test.expectError, gotError) t.Errorf("%s: expected [%v], got [%v]", test.name, test.expectError, gotError)
} }
})
server.Close()
} }
} }
func newTestHTTPServer(f AttachFunc, options *StreamOptions) *httptest.Server { func newTestHTTPServer(f AttachFunc, options *StreamOptions) *httptest.Server {