Skip to content

Commit 336a32a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#130693 from novahe/fix/test-cases
Fix test cases that may potentially cause a panic.
2 parents 2e9bb32 + 9e53371 commit 336a32a

File tree

10 files changed

+34
-0
lines changed

10 files changed

+34
-0
lines changed

‎pkg/client/tests/remotecommand_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func fakeServer(t *testing.T, requestReceived chan struct{}, testName string, ex
124124
opts, err := remotecommand.NewOptions(req)
125125
if err != nil {
126126
t.Errorf("unexpected error %v", err)
127+
return
127128
}
128129
if exec {
129130
cmd := req.URL.Query()[api.ExecCommandParam]

‎staging/src/k8s.io/apiserver/pkg/admission/audit_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,12 @@ func TestWithAuditConcurrency(t *testing.T) {
202202
mutator, ok := handler.(MutationInterface)
203203
if !ok {
204204
t.Error("handler is not an interface of type MutationInterface")
205+
return
205206
}
206207
auditMutator, ok := auditHandler.(MutationInterface)
207208
if !ok {
208209
t.Error("handler is not an interface of type MutationInterface")
210+
return
209211
}
210212
assert.Equal(t, mutator.Admit(ctx, a, nil), auditMutator.Admit(ctx, a, nil), "WithAudit decorator should not effect the return value")
211213
}()

‎staging/src/k8s.io/apiserver/pkg/util/proxy/streamtunnel_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ func TestTunnelingHandler_UpgradeStreamingAndTunneling(t *testing.T) {
5959
_, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name})
6060
if err != nil {
6161
t.Errorf("unexpected error %v", err)
62+
return
6263
}
6364
upgrader := spdy.NewResponseUpgrader()
6465
conn := upgrader.UpgradeResponse(w, req, justQueueStream(streamChan))
6566
if conn == nil {
6667
t.Error("connect is unexpected nil")
68+
return
6769
}
6870
defer conn.Close() //nolint:errcheck
6971
<-stopServerChan
@@ -103,10 +105,12 @@ func TestTunnelingHandler_UpgradeStreamingAndTunneling(t *testing.T) {
103105
clientStream, err := spdyClient.CreateStream(http.Header{})
104106
if err != nil {
105107
t.Errorf("unexpected error %v", err)
108+
return
106109
}
107110
_, err = io.Copy(clientStream, bytes.NewReader(randomData))
108111
if err != nil {
109112
t.Errorf("unexpected error %v", err)
113+
return
110114
}
111115
clientStream.Close() //nolint:errcheck
112116
}()
@@ -179,6 +183,7 @@ func TestTunnelingHandler_BadHandshakeError(t *testing.T) {
179183
_, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name})
180184
if err == nil {
181185
t.Errorf("handshake should have returned an error %v", err)
186+
return
182187
}
183188
assert.ErrorContains(t, err, "unable to negotiate protocol")
184189
w.WriteHeader(http.StatusForbidden)
@@ -235,6 +240,7 @@ func TestTunnelingHandler_UpstreamSPDYServerErrorPropagated(t *testing.T) {
235240
_, err := httpstream.Handshake(req, w, []string{constants.PortForwardV1Name})
236241
if err != nil {
237242
t.Errorf("handshake should have succeeded %v", err)
243+
return
238244
}
239245
// Returned status code should be incremented in metrics.
240246
w.WriteHeader(statusCode)

‎staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ func TestCachedDiscoveryClientUnaggregatedServerGroups(t *testing.T) {
352352
output, err := json.Marshal(body)
353353
if err != nil {
354354
t.Errorf("unexpected error %v", err)
355+
return
355356
}
356357
// Content-type is "unaggregated" discovery format -- no resources returned.
357358
w.Header().Set("Content-Type", discovery.AcceptV1)

‎staging/src/k8s.io/client-go/discovery/cached/memory/memcache_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ func TestMemCacheGroupsAndMaybeResources(t *testing.T) {
589589
output, err := json.Marshal(body)
590590
if err != nil {
591591
t.Errorf("unexpected error %v", err)
592+
return
592593
}
593594
// Content-type is "unaggregated" discovery format -- no resources returned.
594595
w.Header().Set("Content-Type", discovery.AcceptV1)
@@ -1120,6 +1121,7 @@ func TestAggregatedMemCacheGroupsAndMaybeResources(t *testing.T) {
11201121
output, err := json.Marshal(agg)
11211122
if err != nil {
11221123
t.Errorf("unexpected error %v", err)
1124+
return
11231125
}
11241126
// Content-type is "aggregated" discovery format.
11251127
w.Header().Set("Content-Type", discovery.AcceptV2)
@@ -1420,6 +1422,7 @@ func TestMemCacheAggregatedServerGroups(t *testing.T) {
14201422
output, err := json.Marshal(agg)
14211423
if err != nil {
14221424
t.Errorf("unexpected error %v", err)
1425+
return
14231426
}
14241427
// Content-type is "aggregated" discovery format.
14251428
w.Header().Set("Content-Type", discovery.AcceptV2Beta1)

‎staging/src/k8s.io/client-go/discovery/discovery_client_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@ func TestAggregatedServerGroups(t *testing.T) {
13251325
output, err = json.Marshal(agg)
13261326
if err != nil {
13271327
t.Errorf("unexpected error %v", err)
1328+
return
13281329
}
13291330
// Content-Type is "aggregated" discovery format. Add extra parameter
13301331
// to ensure we are resilient to these extra parameters.
@@ -1333,6 +1334,7 @@ func TestAggregatedServerGroups(t *testing.T) {
13331334
_, err = w.Write(output)
13341335
if err != nil {
13351336
t.Errorf("unexpected error %v", err)
1337+
return
13361338
}
13371339
}))
13381340
defer server.Close()
@@ -2399,6 +2401,7 @@ func TestAggregatedServerGroupsAndResources(t *testing.T) {
23992401
output, err = json.Marshal(agg)
24002402
if err != nil {
24012403
t.Errorf("unexpected error %v", err)
2404+
return
24022405
}
24032406
} else {
24042407
var agg *apidiscoveryv2beta1.APIGroupDiscoveryList
@@ -2414,6 +2417,7 @@ func TestAggregatedServerGroupsAndResources(t *testing.T) {
24142417
output, err = json.Marshal(&agg)
24152418
if err != nil {
24162419
t.Errorf("unexpected error %v", err)
2420+
return
24172421
}
24182422
}
24192423
// Content-Type is "aggregated" discovery format. Add extra parameter
@@ -2565,6 +2569,7 @@ func TestAggregatedServerGroupsAndResourcesWithErrors(t *testing.T) {
25652569
output, err = json.Marshal(agg)
25662570
if err != nil {
25672571
t.Errorf("unexpected error %v", err)
2572+
return
25682573
}
25692574
// Content-Type is "aggregated" discovery format. Add extra parameter
25702575
// to ensure we are resilient to these extra parameters.
@@ -3182,6 +3187,7 @@ func TestAggregatedServerPreferredResources(t *testing.T) {
31823187
output, err = json.Marshal(agg)
31833188
if err != nil {
31843189
t.Errorf("unexpected error %v", err)
3190+
return
31853191
}
31863192
// Content-Type is "aggregated" discovery format. Add extra parameter
31873193
// to ensure we are resilient to these extra parameters.

‎staging/src/k8s.io/client-go/tools/portforward/tunneling_connection_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@ func TestTunnelingConnection_ReadWriteClose(t *testing.T) {
5353
conn, err := upgrader.Upgrade(w, req, nil)
5454
if err != nil {
5555
t.Errorf("unexpected error %v", err)
56+
return
5657
}
5758
defer conn.Close() //nolint:errcheck
5859
if conn.Subprotocol() != constants.WebsocketsSPDYTunnelingPortForwardV1 {
5960
t.Errorf("Not acceptable agreement Subprotocol: %v", conn.Subprotocol())
61+
return
6062
}
6163
tunnelingConn := NewTunnelingConnection("server", conn)
6264
spdyConn, err := spdy.NewServerConnection(tunnelingConn, justQueueStream(streamChan))
6365
if err != nil {
6466
t.Errorf("unexpected error %v", err)
67+
return
6568
}
6669
defer spdyConn.Close() //nolint:errcheck
6770
<-stopServerChan
@@ -85,10 +88,12 @@ func TestTunnelingConnection_ReadWriteClose(t *testing.T) {
8588
clientStream, err := spdyClient.CreateStream(http.Header{})
8689
if err != nil {
8790
t.Errorf("unexpected error %v", err)
91+
return
8892
}
8993
_, err = io.Copy(clientStream, strings.NewReader(expected))
9094
if err != nil {
9195
t.Errorf("unexpected error %v", err)
96+
return
9297
}
9398
clientStream.Close() //nolint:errcheck
9499
}()
@@ -114,6 +119,7 @@ func TestTunnelingConnection_LocalRemoteAddress(t *testing.T) {
114119
conn, err := upgrader.Upgrade(w, req, nil)
115120
if err != nil {
116121
t.Errorf("unexpected error %v", err)
122+
return
117123
}
118124
defer conn.Close() //nolint:errcheck
119125
if conn.Subprotocol() != constants.WebsocketsSPDYTunnelingPortForwardV1 {
@@ -150,10 +156,12 @@ func TestTunnelingConnection_ReadWriteDeadlines(t *testing.T) {
150156
conn, err := upgrader.Upgrade(w, req, nil)
151157
if err != nil {
152158
t.Errorf("unexpected error %v", err)
159+
return
153160
}
154161
defer conn.Close() //nolint:errcheck
155162
if conn.Subprotocol() != constants.WebsocketsSPDYTunnelingPortForwardV1 {
156163
t.Errorf("Not acceptable agreement Subprotocol: %v", conn.Subprotocol())
164+
return
157165
}
158166
<-stopServerChan
159167
}))

‎staging/src/k8s.io/client-go/transport/websocket/roundtripper_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,18 @@ func TestWebSocketRoundTripper_RoundTripperFails(t *testing.T) {
115115
statusBytes, err := runtime.Encode(encoder, testCase.status)
116116
if err != nil {
117117
t.Errorf("unexpected error %v", err)
118+
return
118119
}
119120
_, err = w.Write(statusBytes)
120121
if err != nil {
121122
t.Errorf("unexpected error %v", err)
123+
return
122124
}
123125
} else if len(testCase.body) > 0 {
124126
_, err := w.Write([]byte(testCase.body))
125127
if err != nil {
126128
t.Errorf("unexpected error %v", err)
129+
return
127130
}
128131
}
129132
}))

‎staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_discovery_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,16 +395,19 @@ func TestV2Beta1Skew(t *testing.T) {
395395
err := apidiscoveryv2scheme.Convertv2APIGroupDiscoveryListTov2beta1APIGroupDiscoveryList(&apiGroup, &v2b, nil)
396396
if err != nil {
397397
t.Errorf("unexpected error %v", err)
398+
return
398399
}
399400
converted, err := json.Marshal(v2b)
400401
if err != nil {
401402
t.Errorf("unexpected error %v", err)
403+
return
402404
}
403405
w.Header().Set("Content-Type", "application/json;"+"g=apidiscovery.k8s.io;v=v2beta1;as=APIGroupDiscoveryList")
404406
w.WriteHeader(200)
405407
_, err = w.Write(converted)
406408
if err != nil {
407409
t.Errorf("unexpected error %v", err)
410+
return
408411
}
409412
}))
410413
testCtx, cancel := context.WithCancel(context.Background())

‎staging/src/k8s.io/kubelet/pkg/cri/streaming/server_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ func runRemoteCommandTest(t *testing.T, commandType string) {
350350
exec, err := remotecommand.NewSPDYExecutor(&restclient.Config{}, "POST", reqURL)
351351
if err != nil {
352352
t.Errorf("unexpected error %v", err)
353+
return
353354
}
354355

355356
opts := remotecommand.StreamOptions{

0 commit comments

Comments
 (0)