Avoid race between stop/kill and wait

e2e/run_volume_test.go

@@ -124,8 +124,6 @@ func runVolume(t *testing.T, vmName, runtime, networkPlugin string) {
 }
 
 func TestVolumeWithDockerAndDockerBridge(t *testing.T) {
-	// TODO: https://github.com/weaveworks/ignite/issues/658
-	t.Skip("SKIPPING\nThis test fails to stop the VM within docker\nTODO: https://github.com/weaveworks/ignite/issues/658")
 	runVolume(
 		t,
 		"e2e-test-volume-docker-and-docker-bridge",

pkg/runtime/docker/client.go

@@ -175,21 +175,35 @@ func (dc *dockerClient) RunContainer(image meta.OCIImageRef, config *runtime.Con
 }
 
 func (dc *dockerClient) StopContainer(container string, timeout *time.Duration) error {
+	// Start waiting before we do the stop, to avoid race
+	errC, readyC := make(chan error), make(chan struct{})
+	go func() {
+		errC <- dc.waitForContainer(container, cont.WaitConditionNotRunning, &readyC)
+	}()
+	<-readyC // wait until removal detection has started
+
 	if err := dc.client.ContainerStop(context.Background(), container, timeout); err != nil {
 		return err
 	}
 
 	// Wait for the container to be stopped
-	return dc.waitForContainer(container, cont.WaitConditionNotRunning, nil)
+	return <-errC
 }
 
 func (dc *dockerClient) KillContainer(container, signal string) error {
+	// Start waiting before we do the kill, to avoid race
+	errC, readyC := make(chan error), make(chan struct{})
+	go func() {
+		errC <- dc.waitForContainer(container, cont.WaitConditionNotRunning, &readyC)
+	}()
+	<-readyC // wait until removal detection has started
+
 	if err := dc.client.ContainerKill(context.Background(), container, signal); err != nil {
 		return err
 	}
 
 	// Wait for the container to be killed
-	return dc.waitForContainer(container, cont.WaitConditionNotRunning, nil)
+	return <-errC
 }
 
 func (dc *dockerClient) RemoveContainer(container string) error {
@@ -245,7 +259,7 @@ func (dc *dockerClient) waitForContainer(container string, condition cont.WaitCo
 			return fmt.Errorf("failed to wait for container %q: %s", container, result.Error.Message)
 		}
 	case err := <-errC:
-		return err
+		return fmt.Errorf("error waiting for container %q: %w", container, err)
 	}
 
 	return nil