github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 21:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28976 from coufon/debug_mirror_pod_test

Browse Source 
Automatic merge from submit-queue

Fix a bug in mirror pod node e2e test.

Fixed a bug in test/e2e_node/mirror_pod_test.go. The function 'checkMirrorPodDisappear' returns nil even when the pod does not disappear. It should return a non-nil error. 

@Random-Liu
This commit is contained in:
k8s-merge-robot
2016-07-15 17:39:16 -07:00
committed by GitHub
parent e576a2f760 8a4c394ede
commit 5b027a5861
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/mirror_pod_test.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package e2e_node package e2e_node
import ( import (
goerrors "errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@@ -160,7 +161,7 @@ func checkMirrorPodDisappear(cl *client.Client, name, namespace string) error {
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
return nil return nil
} }
return err return goerrors.New("pod not disappear")
} }
func checkMirrorPodRunning(cl *client.Client, name, namespace string) error { func checkMirrorPodRunning(cl *client.Client, name, namespace string) error {