From 8a92d310ba803c7b07bb6002d016f68025866369 Mon Sep 17 00:00:00 2001
From: Gareth Smith <gsmith@pivotal.io>
Date: Fri, 24 Nov 2017 09:20:56 +0000
Subject: [PATCH] Make Stop() wait for the processes to exit

---
 pkg/framework/test/apiserver.go      | 2 +-
 pkg/framework/test/apiserver_test.go | 2 +-
 pkg/framework/test/etcd.go           | 2 +-
 pkg/framework/test/etcd_test.go      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/framework/test/apiserver.go b/pkg/framework/test/apiserver.go
index e39ea96a4..5d4a2901c 100644
--- a/pkg/framework/test/apiserver.go
+++ b/pkg/framework/test/apiserver.go
@@ -41,7 +41,7 @@ func (s *APIServer) Start(etcdURL string) error {
 // Stop stops this process gracefully.
 func (s *APIServer) Stop() {
 	if s.session != nil {
-		s.session.Terminate()
+		s.session.Terminate().Wait()
 	}
 }
 
diff --git a/pkg/framework/test/apiserver_test.go b/pkg/framework/test/apiserver_test.go
index 17b8fbbe8..a7664b4f3 100644
--- a/pkg/framework/test/apiserver_test.go
+++ b/pkg/framework/test/apiserver_test.go
@@ -26,7 +26,7 @@ var _ = Describe("Apiserver", func() {
 
 			By("Stopping the API Server")
 			apiServer.Stop()
-			Eventually(apiServer).Should(gexec.Exit(143))
+			Expect(apiServer).To(gexec.Exit(143))
 		})
 
 	})
diff --git a/pkg/framework/test/etcd.go b/pkg/framework/test/etcd.go
index 5e448af71..4b7c2005e 100644
--- a/pkg/framework/test/etcd.go
+++ b/pkg/framework/test/etcd.go
@@ -36,7 +36,7 @@ func (e *Etcd) Start(etcdURL string, datadir string) error {
 // Stop stops this process gracefully.
 func (e *Etcd) Stop() {
 	if e.session != nil {
-		e.session.Terminate()
+		e.session.Terminate().Wait()
 	}
 }
 
diff --git a/pkg/framework/test/etcd_test.go b/pkg/framework/test/etcd_test.go
index 9b13cbdfc..fa48c07d0 100644
--- a/pkg/framework/test/etcd_test.go
+++ b/pkg/framework/test/etcd_test.go
@@ -26,7 +26,7 @@ var _ = Describe("Etcd", func() {
 
 			By("Stopping the Etcd Server")
 			etcd.Stop()
-			Eventually(etcd).Should(gexec.Exit(143))
+			Expect(etcd).To(gexec.Exit(143))
 		})
 
 	})