Merge pull request #25121 from liangchenye/flakepodnotfound

Automatic merge from submit-queue fix #24937: flake pod not found https://github.com/kubernetes/kubernetes/issues/24937 Split from #24191 Signed-off-by: liang chenye <liangchenye@huawei.com>

Merge pull request #25121 from liangchenye/flakepodnotfound
2ebd7719 · k8s-merge-robot · 4a00266f · 3c9306e5 · 2ebd7719
Commit 2ebd7719 authored May 05, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

container_manager_test.go test/e2e_node/container_manager_test.go +3 -1

No files found.
--- a/test/e2e_node/container_manager_test.go
+++ b/test/e2e_node/container_manager_test.go
@@ -24,6 +24,7 @@ import (
 	apierrs "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/client/restclient"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/util"

 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -38,9 +39,10 @@ var _ = Describe("Kubelet Container Manager", func() {
 	Describe("oom score adjusting", func() {
 		namespace := "oom-adj"
 		Context("when scheduling a busybox command that always fails in a pod", func() {
-			podName := "bin-false"
+			var podName string

 			BeforeEach(func() {
+				podName = "bin-false" + string(util.NewUUID())
 				pod := &api.Pod{
 					ObjectMeta: api.ObjectMeta{
 						Name:      podName,