浏览代码

Merge pull request #30151 from tonistiigi/fix-defunct

Avoid defunct registry/notary processes during tests
Vincent Demeester 8 年之前
父节点
当前提交
ead8ce2431
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      integration-cli/registry/registry.go
  2. 1 0
      integration-cli/trust_server_test.go

+ 1 - 0
integration-cli/registry/registry.go

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

+ 1 - 0
integration-cli/trust_server_test.go

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