beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid defunct registry/notary processes during tests

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2017-01-13 17:45:14 -08:00
parent 1eafa0f706
commit 09dbce5f5a
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration-cli/registry/registry.go
View file

@ -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
integration-cli/trust_server_test.go
View file

@ -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)
} }