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

Merge pull request #90522 from beautytiger/fix/nilranger

Browse Source 
cleanup: no need nil check before range
This commit is contained in:
Kubernetes Prow Robot 2020-08-27 17:54:31 -07:00 committed by GitHub
commit c143ea4bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/util.go
View File

@ -224,13 +224,11 @@ func DeleteNamespaces(c clientset.Interface, deleteFilter, skipFilter []string)
var wg sync.WaitGroup var wg sync.WaitGroup
OUTER: OUTER:
for _, item := range nsList.Items { for _, item := range nsList.Items {
if skipFilter != nil {
for _, pattern := range skipFilter { for _, pattern := range skipFilter {
if strings.Contains(item.Name, pattern) { if strings.Contains(item.Name, pattern) {
continue OUTER continue OUTER
} }
} }
}
if deleteFilter != nil { if deleteFilter != nil {
var shouldDelete bool var shouldDelete bool
for _, pattern := range deleteFilter { for _, pattern := range deleteFilter {

2
test/e2e_node/services/services.go
View File

@ -93,7 +93,6 @@ func (e *E2EServices) Stop() {
klog.Errorf("Failed to stop kubelet: %v", err) klog.Errorf("Failed to stop kubelet: %v", err)
} }
} }
if e.rmDirs != nil {
for _, d := range e.rmDirs { for _, d := range e.rmDirs {
err := os.RemoveAll(d) err := os.RemoveAll(d)
if err != nil { if err != nil {
@ -101,7 +100,6 @@ func (e *E2EServices) Stop() {
} }
} }
} }
}
// RunE2EServices actually start the e2e services. This function is used to // RunE2EServices actually start the e2e services. This function is used to
// start e2e services in current process. This is only used in run-services-mode. // start e2e services in current process. This is only used in run-services-mode.

2
test/integration/apiserver/admissionwebhook/reinvocation_test.go
View File

@ -447,13 +447,11 @@ func testWebhookReinvocationPolicy(t *testing.T, watchCache bool) {
} }
} }
if tt.expectInvocations != nil {
for k, v := range tt.expectInvocations { for k, v := range tt.expectInvocations {
if recorder.GetCount(k) != v { if recorder.GetCount(k) != v {
t.Errorf("expected %d invocations of %s, but got %d", v, k, recorder.GetCount(k)) t.Errorf("expected %d invocations of %s, but got %d", v, k, recorder.GetCount(k))
} }
} }
}
stream, err := os.OpenFile(logFile.Name(), os.O_RDWR, 0600) stream, err := os.OpenFile(logFile.Name(), os.O_RDWR, 0600)
if err != nil { if err != nil {