testutil: sync with containerd#127

estesp merged 1 commit intocontainerd:mastercontainerd/continuity:masterfrom

AkihiroSuda:sync-testutilAkihiroSuda/continuity:sync-testutilCopy head branch name to clipboard