[FAB-10493] run waits for container termination

Instead of returning after stop, wait for the containers to terminate.

Change-Id: I8ebaef9808b2dff2d29155dac09bf8a19c04c180
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

integration/runner/couchdb.go

@@ -140,11 +140,15 @@ func (c *CouchDB) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 	cancel()
 	close(ready)
 
-	select {
-	case err := <-containerExit:
-		return err
-	case <-sigCh:
-		return c.Stop()
+	for {
+		select {
+		case err := <-containerExit:
+			return err
+		case <-sigCh:
+			if err := c.Stop(); err != nil {
+				return err
+			}
+		}
 	}
 }
 
@@ -186,9 +190,11 @@ func (c *CouchDB) ready(ctx context.Context, addr string) <-chan struct{} {
 func (c *CouchDB) wait() <-chan error {
 	exitCh := make(chan error)
 	go func() {
-		if _, err := c.Client.WaitContainer(c.containerID); err != nil {
-			exitCh <- err
+		exitCode, err := c.Client.WaitContainer(c.containerID)
+		if err == nil {
+			err = fmt.Errorf("couchdb: process exited with %d", exitCode)
 		}
+		exitCh <- err
 	}()
 
 	return exitCh

integration/runner/couchdb_test.go

@@ -195,7 +195,7 @@ var _ = Describe("CouchDB Runner", func() {
 
 		By("terminating the container")
 		process.Signal(syscall.SIGTERM)
-		Eventually(process.Wait()).Should(Receive(BeNil()))
+		Eventually(process.Wait()).Should(Receive())
 		process = nil
 
 		Eventually(func() error {

integration/runner/kafka.go

@@ -193,11 +193,15 @@ func (k *Kafka) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 	cancel()
 	close(ready)
 
-	select {
-	case err := <-containerExit:
-		return err
-	case <-sigCh:
-		return k.Stop()
+	for {
+		select {
+		case err := <-containerExit:
+			return err
+		case <-sigCh:
+			if err := k.Stop(); err != nil {
+				return err
+			}
+		}
 	}
 }
 
@@ -248,9 +252,11 @@ func (k *Kafka) ready(ctx context.Context, addr string) <-chan struct{} {
 func (k *Kafka) wait() <-chan error {
 	exitCh := make(chan error)
 	go func() {
-		if _, err := k.Client.WaitContainer(k.ContainerID); err != nil {
-			exitCh <- err
+		exitCode, err := k.Client.WaitContainer(k.ContainerID)
+		if err == nil {
+			err = fmt.Errorf("kafka: process exited with %d", exitCode)
 		}
+		exitCh <- err
 	}()
 
 	return exitCh

integration/runner/kafka_test.go

@@ -112,7 +112,7 @@ var _ = Describe("Kafka Runner", func() {
 
 		By("terminating the container")
 		process.Signal(syscall.SIGTERM)
-		Eventually(process.Wait(), 2*time.Second).Should(Receive(BeNil()))
+		Eventually(process.Wait(), 10*time.Second).Should(Receive())
 
 		_, err = client.InspectContainer("kafka1")
 		Expect(err).To(MatchError("No such container: kafka1"))

integration/runner/zookeeper.go

@@ -167,20 +167,26 @@ func (z *Zookeeper) Run(sigCh <-chan os.Signal, ready chan<- struct{}) error {
 
 	close(ready)
 
-	select {
-	case err := <-containerExit:
-		return err
-	case <-sigCh:
-		return z.Stop()
+	for {
+		select {
+		case err := <-containerExit:
+			return err
+		case <-sigCh:
+			if err := z.Stop(); err != nil {
+				return err
+			}
+		}
 	}
 }
 
 func (z *Zookeeper) wait() <-chan error {
 	exitCh := make(chan error)
 	go func() {
-		if _, err := z.Client.WaitContainer(z.containerID); err != nil {
-			exitCh <- err
+		exitCode, err := z.Client.WaitContainer(z.containerID)
+		if err == nil {
+			err = fmt.Errorf("zookeeper: process exited with %d", exitCode)
 		}
+		exitCh <- err
 	}()
 
 	return exitCh