Skip to content
Permalink
Browse files

Merge pull request #2198 from AkihiroSuda/criu-master

temporarily disable CRIU tests
  • Loading branch information
hqhq committed Jan 14, 2020
2 parents 5cc0dea + 55f8c25 commit 709377ca558df88ea538852c9310b700f140fc9b
Showing with 7 additions and 0 deletions.
  1. +5 −0 libcontainer/cgroups/fs2/fs2.go
  2. +2 −0 libcontainer/integration/checkpoint_test.go
@@ -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
}
@@ -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)
}

0 comments on commit 709377c

Please sign in to comment.
You can’t perform that action at this time.