containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12865 from rhatdan/crun 

I believe that these tests will now run with crun.
This commit is contained in:
OpenShift Merge Robot 2022-08-10 10:38:46 +00:00 committed by GitHub
parent aa13c73f71 25f6fc9c6a
commit 89ab5c9fab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/checkpoint_test.go
View File

@ -1005,9 +1005,6 @@ var _ = Describe("Podman checkpoint", func() {
if !criu.MemTrack() { if !criu.MemTrack() {
Skip("system (architecture/kernel/CRIU) does not support memory tracking") Skip("system (architecture/kernel/CRIU) does not support memory tracking")
} }
if !strings.Contains(podmanTest.OCIRuntime, "runc") {
Skip("Test only works on runc 1.0-rc3 or higher.")
}
localRunString := getRunString([]string{ALPINE, "top"}) localRunString := getRunString([]string{ALPINE, "top"})
session := podmanTest.Podman(localRunString) session := podmanTest.Podman(localRunString)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
@ -1041,9 +1038,6 @@ var _ = Describe("Podman checkpoint", func() {
if !criu.MemTrack() { if !criu.MemTrack() {
Skip("system (architecture/kernel/CRIU) does not support memory tracking") Skip("system (architecture/kernel/CRIU) does not support memory tracking")
} }
if !strings.Contains(podmanTest.OCIRuntime, "runc") {
Skip("Test only works on runc 1.0-rc3 or higher.")
}
localRunString := getRunString([]string{ALPINE, "top"}) localRunString := getRunString([]string{ALPINE, "top"})
session := podmanTest.Podman(localRunString) session := podmanTest.Podman(localRunString)
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()