Make Stop() wait for the processes to exit

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()
 	}
 }
 

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))
 		})
 
 	})

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()
 	}
 }
 

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))
 		})
 
 	})