Merge pull request #28976 from coufon/debug_mirror_pod_test

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

Merge pull request #28976 from coufon/debug_mirror_pod_test
5b027a58 · k8s-merge-robot · GitHub · e576a2f7 · 8a4c394e · 5b027a58
Commit 5b027a58 authored Jul 15, 2016 by k8s-merge-robot Committed by GitHub Jul 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

mirror_pod_test.go test/e2e_node/mirror_pod_test.go +2 -1

No files found.
--- a/test/e2e_node/mirror_pod_test.go
+++ b/test/e2e_node/mirror_pod_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package e2e_node

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

 func checkMirrorPodRunning(cl *client.Client, name, namespace string) error {