Skip to content

Commit

Permalink
Merge pull request #25121 from liangchenye/flakepodnotfound
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

fix #24937:  flake pod not found

#24937
Split from #24191
Signed-off-by: liang chenye <liangchenye@huawei.com>
  • Loading branch information
k8s-merge-robot committed May 6, 2016
2 parents 4a00266 + 3c9306e commit 2ebd771
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion test/e2e_node/container_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down

0 comments on commit 2ebd771

Please sign in to comment.