jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2198 from AkihiroSuda/criu-master 

temporarily disable CRIU tests
This commit is contained in:
Qiang Huang 2020-01-14 18:57:19 +08:00 committed by GitHub
parent 5cc0deaf7a 55f8c254be
commit 709377ca55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainer/cgroups/fs2/fs2.go
View File

@ -205,5 +205,10 @@ func (m *manager) Set(container *configs.Config) error {
if len(errs) > 0 && !m.rootless {
return errors.Errorf("error while setting cgroup v2: %+v", errs)
}
m.config = container.Cgroups
return nil
}
func (m *manager) GetCgroups() (*configs.Cgroup, error) {
return m.config, nil
}

2
libcontainer/integration/checkpoint_test.go
View File

@ -42,6 +42,7 @@ 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")
}
@ -53,6 +54,7 @@ func TestUsernsCheckpoint(t *testing.T) {
}
func TestCheckpoint(t *testing.T) {
t.Skip("Ubuntu kernel is broken to run criu (#2196, #2198)")
testCheckpoint(t, false)
}