mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2226 from avagin/runsc-restore-cmd-wait

Browse Source 
restore: fix a race condition in process.Wait()
This commit is contained in:
Mrunal Patel
2020-03-15 18:48:16 -07:00
committed by GitHub
parent a15d2c3ca0 269ea385a4
commit 981dbef514
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/integration/checkpoint_test.go
+1 -3
View File
@@ -42,7 +42,6 @@ func showFile(t *testing.T, fname string) error {
}
func TestUsernsCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
t.Skip("userns is unsupported")
}
@@ -54,7 +53,6 @@ func TestUsernsCheckpoint(t *testing.T) {
}
func TestCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
testCheckpoint(t, false)
}
@@ -248,7 +246,7 @@ func testCheckpoint(t *testing.T, userns bool) {
}
restoreStdinW.Close()
s, err := process.Wait()
s, err := restoreProcessConfig.Wait()
if err != nil {
t.Fatal(err)
}