Merge pull request #31451 from jfrazelle/27532-fix-kubectl-on-delete-flake

Automatic merge from submit-queue

test/e2e: fix flake for on delete on namespace

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```

Fixes #27532
This commit is contained in:
Kubernetes Submit Queue 2016-09-05 11:47:09 -07:00 committed by GitHub
commit 8f54ab1766

View File

@ -1016,7 +1016,17 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
}) })
AfterEach(func() { AfterEach(func() {
framework.RunKubectlOrDie("delete", "deployment", dName, nsFlag) err := wait.Poll(framework.Poll, 2*time.Minute, func() (bool, error) {
out, err := framework.RunKubectl("delete", "deployment", dName, nsFlag)
if err != nil {
if strings.Contains(err.Error(), "could not find default credentials") {
err = nil
}
return false, fmt.Errorf("kubectl delete failed output: %s, err: %v", out, err)
}
return true, nil
})
Expect(err).NotTo(HaveOccurred())
}) })
It("should create a deployment from an image [Conformance]", func() { It("should create a deployment from an image [Conformance]", func() {