github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7424 from cpuguy83/skip_shimcgroup

Browse Source
This commit is contained in:
Samuel Karp 2022-09-23 15:06:44 -07:00 committed by GitHub
commit 4bd8b5be44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/client/client_test.go
View File

@ -46,11 +46,13 @@ var (
noDaemon bool noDaemon bool
noCriu bool noCriu bool
supportsCriu bool supportsCriu bool
noShimCgroup bool
) )
func init() { func init() {
flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests") flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")
flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests") flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests")
flag.BoolVar(&noShimCgroup, "no-shim-cgroup", false, "Do not run the shim cgroup tests")
} }
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

4
integration/client/container_linux_test.go
View File

@ -160,6 +160,10 @@ func TestTaskUpdate(t *testing.T) {
} }
func TestShimInCgroup(t *testing.T) { func TestShimInCgroup(t *testing.T) {
if noShimCgroup {
t.Skip("shim cgroup is not enabled")
}
t.Parallel() t.Parallel()
client, err := newClient(t, address) client, err := newClient(t, address)