Merge pull request #8309 from gmarek/fix_e2e

test/e2e/kubectl.go

@@ -72,7 +72,7 @@ var _ = Describe("kubectl", func() {
 		)
 
 		It("should create and stop a replication controller", func() {
-			defer cleanup(nautilusPath, updateDemoSelector)
+			defer cleanup(nautilusPath, ns, updateDemoSelector)
 
 			By("creating a replication controller")
 			runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@@ -80,7 +80,7 @@ var _ = Describe("kubectl", func() {
 		})
 
 		It("should scale a replication controller", func() {
-			defer cleanup(nautilusPath, updateDemoSelector)
+			defer cleanup(nautilusPath, ns, updateDemoSelector)
 
 			By("creating a replication controller")
 			runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@@ -95,7 +95,7 @@ var _ = Describe("kubectl", func() {
 
 		It("should do a rolling update of a replication controller", func() {
 			// Cleanup all resources in case we fail somewhere in the middle
-			defer cleanup(updateDemoRoot, updateDemoSelector)
+			defer cleanup(updateDemoRoot, ns, updateDemoSelector)
 
 			By("creating the initial replication controller")
 			runKubectl("create", "-f", nautilusPath, fmt.Sprintf("--namespace=%v", ns))
@@ -115,7 +115,7 @@ var _ = Describe("kubectl", func() {
 				return
 			}
 
-			defer cleanup(guestbookPath, frontendSelector, redisMasterSelector, redisSlaveSelector)
+			defer cleanup(guestbookPath, ns, frontendSelector, redisMasterSelector, redisSlaveSelector)
 
 			By("creating all guestbook components")
 			runKubectl("create", "-f", guestbookPath, fmt.Sprintf("--namespace=%v", ns))

test/e2e/util.go

@@ -212,12 +212,17 @@ func expectNoError(err error, explain ...interface{}) {
 	ExpectWithOffset(1, err).NotTo(HaveOccurred(), explain...)
 }
 
-func cleanup(filePath string, selectors ...string) {
+// Stops everything from filePath from namespace ns and checks if everything maching selectors from the given namespace is correctly stopped.
+func cleanup(filePath string, ns string, selectors ...string) {
 	By("using stop to clean up resources")
-	runKubectl("stop", "-f", filePath)
+	var nsArg string
+	if ns != "" {
+		nsArg = fmt.Sprintf("--namespace=%s", ns)
+	}
+	runKubectl("stop", "-f", filePath, nsArg)
 
 	for _, selector := range selectors {
-		resources := runKubectl("get", "pods,rc,se", "-l", selector, "--no-headers")
+		resources := runKubectl("get", "pods,rc,se", "-l", selector, "--no-headers", nsArg)
 		if resources != "" {
 			Failf("Resources left running after stop:\n%s", resources)
 		}