Merge pull request #1525 from crosbymichael/shim-hang

Add wait API endpoint for waiting on process exit

container_linux_test.go

@@ -767,9 +767,16 @@ func TestShimSigkilled(t *testing.T) {
 
 	<-statusC
 
+	for i := 0; i < 10; i++ {
+		if err := unix.Kill(int(pid), 0); err == unix.ESRCH {
+			break
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
 	if err := unix.Kill(int(pid), 0); err != unix.ESRCH {
 		t.Errorf("pid %d still exists", pid)
 	}
+
 }
 
 func TestDaemonRestartWithRunningShim(t *testing.T) {