github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +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

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

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

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

@ -93,12 +93,10 @@ func (e *E2EServices) Stop() {
klog.Errorf("Failed to stop kubelet: %v", err)
}
}
if e.rmDirs != nil {
for _, d := range e.rmDirs {
err := os.RemoveAll(d)
if err != nil {
klog.Errorf("Failed to delete directory %s: %v", d, err)
}
for _, d := range e.rmDirs {
err := os.RemoveAll(d)
if err != nil {
klog.Errorf("Failed to delete directory %s: %v", d, err)
}
}
}

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

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