Merge pull request #30151 from tonistiigi/fix-defunct

Avoid defunct registry/notary processes during tests
Upstream-commit: ead8ce2431988170b8c89dbd8053d1824e9a919d
Component: engine

components/engine/integration-cli/registry/registry.go

@@ -138,6 +138,7 @@ func (r *V2) Ping() error {
 // Close kills the registry server
 func (r *V2) Close() {
 	r.cmd.Process.Kill()
+	r.cmd.Process.Wait()
 	os.RemoveAll(r.dir)
 }
 

components/engine/integration-cli/trust_server_test.go

@@ -186,6 +186,7 @@ func (t *testNotary) Ping() error {
 
 func (t *testNotary) Close() {
 	t.cmd.Process.Kill()
+	t.cmd.Process.Wait()
 	os.RemoveAll(t.dir)
 }