From 728165f31e3d65bec423393d5281ca4ebcab25ff Mon Sep 17 00:00:00 2001
From: David Bariod <davidriod@googlemail.com>
Date: Wed, 9 Jun 2021 17:30:26 +0200
Subject: [PATCH] remove a race condition in sdk testutil server stop (#10342)

* remove a race condition in sdk testutil server stop

* ensure the process has actually stopped
---
 sdk/testutil/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/testutil/server.go b/sdk/testutil/server.go
index 63de0c4ba..b5d4de77e 100644
--- a/sdk/testutil/server.go
+++ b/sdk/testutil/server.go
@@ -342,7 +342,7 @@ func (s *TestServer) Stop() error {
 		return err
 	case <-time.After(10 * time.Second):
 		s.cmd.Process.Signal(syscall.SIGABRT)
-		s.cmd.Wait()
+		<-waitDone
 		return fmt.Errorf("timeout waiting for server to stop gracefully")
 	}
 }