From be8d081539bb37cdea1fb62fa2996f7e46336ad4 Mon Sep 17 00:00:00 2001
From: lixiaobing10051267
Date: Sat, 23 Jul 2016 13:49:04 +0800
Subject: [PATCH] Check all places to break the loop when object found
---
pkg/apis/rbac/validation/policy_comparator_test.go | 1 +
pkg/client/testing/core/fixture.go | 1 +
pkg/controller/petset/pet_set_test.go | 1 +
pkg/kubectl/resource/builder_test.go | 1 +
pkg/kubelet/dockertools/docker_manager_test.go | 1 +
5 files changed, 5 insertions(+)
diff --git a/pkg/apis/rbac/validation/policy_comparator_test.go b/pkg/apis/rbac/validation/policy_comparator_test.go
index 85e51237aab..2b5c3b2072f 100644
--- a/pkg/apis/rbac/validation/policy_comparator_test.go
+++ b/pkg/apis/rbac/validation/policy_comparator_test.go
@@ -389,6 +389,7 @@ func rulesMatch(expectedRules, actualRules []rbac.PolicyRule) bool {
for _, actualRule := range actualRules {
if reflect.DeepEqual(expectedRule, actualRule) {
found = true
+ break
}
}
diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go
index 9902e49860e..9bc6a278077 100644
--- a/pkg/client/testing/core/fixture.go
+++ b/pkg/client/testing/core/fixture.go
@@ -350,6 +350,7 @@ func (t *tracker) Delete(gvk unversioned.GroupVersionKind, ns, name string) erro
if objMeta.GetNamespace() == ns && objMeta.GetName() == name {
t.objects[gvk] = append(t.objects[gvk][:i], t.objects[gvk][i+1:]...)
found = true
+ break
}
}
diff --git a/pkg/controller/petset/pet_set_test.go b/pkg/controller/petset/pet_set_test.go
index 61e626f9bc6..7c2d77eec55 100644
--- a/pkg/controller/petset/pet_set_test.go
+++ b/pkg/controller/petset/pet_set_test.go
@@ -219,6 +219,7 @@ func TestPetSetControllerBlocksScaling(t *testing.T) {
for _, p := range fc.getPodList() {
if p.Name == deletedPod.Name {
found = true
+ break
}
}
if !found {
diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go
index 05698520824..42dd3902e4b 100644
--- a/pkg/kubectl/resource/builder_test.go
+++ b/pkg/kubectl/resource/builder_test.go
@@ -445,6 +445,7 @@ func TestDirectoryBuilder(t *testing.T) {
for _, info := range test.Infos {
if info.Name == "redis-master" && info.Namespace == "test" && info.Object != nil {
found = true
+ break
}
}
if !found {
diff --git a/pkg/kubelet/dockertools/docker_manager_test.go b/pkg/kubelet/dockertools/docker_manager_test.go
index 714177bcc39..117ee57474e 100644
--- a/pkg/kubelet/dockertools/docker_manager_test.go
+++ b/pkg/kubelet/dockertools/docker_manager_test.go
@@ -613,6 +613,7 @@ func TestSyncPodCreateNetAndContainer(t *testing.T) {
for _, c := range fakeDocker.RunningContainerList {
if c.Image == "pod_infra_image" && strings.HasPrefix(c.Names[0], "/k8s_POD") {
found = true
+ break
}
}
if !found {