opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 15:23:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2839 from openSUSE/runtest-improvement

Browse Source 
Update run_test to be more robust
This commit is contained in:
OpenShift Merge Robot
2019-04-03 23:59:47 -07:00
committed by GitHub
parent 4bda5378b1 ab4d70d55c
commit e28d30c93b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/podman/run_test.go
View File

@ -8,6 +8,7 @@ import (
"github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/inspect"
cc "github.com/containers/libpod/pkg/spec" cc "github.com/containers/libpod/pkg/spec"
"github.com/containers/libpod/pkg/sysinfo"
"github.com/docker/go-units" "github.com/docker/go-units"
ociv1 "github.com/opencontainers/image-spec/specs-go/v1" ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
@ -16,8 +17,9 @@ import (
) )
var ( var (
cmd = []string{"podman", "test", "alpine"} sysInfo = sysinfo.New(true)
CLI *cliconfig.PodmanCommand cmd = []string{"podman", "test", "alpine"}
CLI *cliconfig.PodmanCommand
) )
// generates a mocked ImageData structure based on alpine // generates a mocked ImageData structure based on alpine
@ -100,6 +102,9 @@ func TestPIDsLimit(t *testing.T) {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
t.Skip("seccomp, which is enabled by default, is only supported on Linux") t.Skip("seccomp, which is enabled by default, is only supported on Linux")
} }
if !sysInfo.PidsLimit {
t.Skip("running test not supported by the host system")
}
args := []string{"--pids-limit", "22"} args := []string{"--pids-limit", "22"}
a := createCLI(args) a := createCLI(args)
a.InputArgs = args a.InputArgs = args
@ -119,6 +124,9 @@ func TestBLKIOWeightDevice(t *testing.T) {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
t.Skip("seccomp, which is enabled by default, is only supported on Linux") t.Skip("seccomp, which is enabled by default, is only supported on Linux")
} }
if !sysInfo.BlkioWeightDevice {
t.Skip("running test not supported by the host system")
}
args := []string{"--blkio-weight-device", "/dev/zero:100"} args := []string{"--blkio-weight-device", "/dev/zero:100"}
a := createCLI(args) a := createCLI(args)
a.InputArgs = args a.InputArgs = args
@ -137,6 +145,9 @@ func TestMemorySwap(t *testing.T) {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
t.Skip("seccomp, which is enabled by default, is only supported on Linux") t.Skip("seccomp, which is enabled by default, is only supported on Linux")
} }
if !sysInfo.SwapLimit {
t.Skip("running test not supported by the host system")
}
args := []string{"--memory-swap", "45m", "--memory", "40m"} args := []string{"--memory-swap", "45m", "--memory", "40m"}
a := createCLI(args) a := createCLI(args)
a.InputArgs = args a.InputArgs = args