From 98864265a20e9095f0a956c750347a53e0bd8d76 Mon Sep 17 00:00:00 2001
From: Sebastain Jug <seb@stianj.ug>
Date: Mon, 5 Dec 2016 16:27:07 -0500
Subject: [PATCH] New ns param for NewClusterVerification

---
 test/e2e/examples.go            | 1 +
 test/e2e/framework/framework.go | 4 ++--
 test/e2e/kubectl.go             | 1 +
 test/e2e/logging_soak.go        | 1 +
 test/e2e/networking_perf.go     | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/e2e/examples.go b/test/e2e/examples.go
index e00a65f8ff8..d6456d7fd6f 100644
--- a/test/e2e/examples.go
+++ b/test/e2e/examples.go
@@ -48,6 +48,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
 	// Reusable cluster state function.  This won't be adversly affected by lazy initialization of framework.
 	clusterState := func(selectorKey string, selectorValue string) *framework.ClusterVerification {
 		return f.NewClusterVerification(
+			f.Namespace,
 			framework.PodStateVerification{
 				Selectors:   map[string]string{selectorKey: selectorValue},
 				ValidPhases: []v1.PodPhase{v1.PodRunning},
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 03f99a0afa3..1130261e966 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -853,10 +853,10 @@ type ClusterVerification struct {
 	podState  PodStateVerification
 }
 
-func (f *Framework) NewClusterVerification(filter PodStateVerification) *ClusterVerification {
+func (f *Framework) NewClusterVerification(namespace *v1.Namespace, filter PodStateVerification) *ClusterVerification {
 	return &ClusterVerification{
 		f.ClientSet,
-		f.Namespace,
+		namespace,
 		filter,
 	}
 }
diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go
index 5333641c69e..c06c1a8e1db 100644
--- a/test/e2e/kubectl.go
+++ b/test/e2e/kubectl.go
@@ -267,6 +267,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
 	// Reustable cluster state function.  This won't be adversly affected by lazy initialization of framework.
 	clusterState := func() *framework.ClusterVerification {
 		return f.NewClusterVerification(
+			f.Namespace,
 			framework.PodStateVerification{
 				Selectors:   map[string]string{"app": "redis"},
 				ValidPhases: []v1.PodPhase{v1.PodRunning /*v1.PodPending*/},
diff --git a/test/e2e/logging_soak.go b/test/e2e/logging_soak.go
index a95feea4e23..7640db81ba6 100644
--- a/test/e2e/logging_soak.go
+++ b/test/e2e/logging_soak.go
@@ -114,6 +114,7 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname
 	)
 
 	logSoakVerification := f.NewClusterVerification(
+		f.Namespace,
 		framework.PodStateVerification{
 			Selectors:   podlables,
 			ValidPhases: []v1.PodPhase{v1.PodRunning, v1.PodSucceeded},
diff --git a/test/e2e/networking_perf.go b/test/e2e/networking_perf.go
index 55b67b3071b..c998fba0a9c 100644
--- a/test/e2e/networking_perf.go
+++ b/test/e2e/networking_perf.go
@@ -119,6 +119,7 @@ var _ = framework.KubeDescribe("Networking IPerf [Experimental] [Slow] [Feature:
 		iperfResults := &IPerfResults{}
 
 		iperfClusterVerification := f.NewClusterVerification(
+			f.Namespace,
 			framework.PodStateVerification{
 				Selectors:   iperfClientPodLabels,
 				ValidPhases: []v1.PodPhase{v1.PodSucceeded},