diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 07:53:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 07:53:11 -0700 |
| commit | 2e6bc3c7af261228ae7a75cb5749062928fa24b3 (patch) | |
| tree | 94b3af23e8f5d774be0e4846698fac685a5f56f3 /test/e2e/checkpoint_test.go | |
| parent | 79befd5158c8f01a88e4d14e46851ddcc11d51c4 (diff) | |
| parent | a14155917baa577bebbbc0c5983a7a90bf35c2b5 (diff) | |
| download | podman-2e6bc3c7af261228ae7a75cb5749062928fa24b3.tar.gz podman-2e6bc3c7af261228ae7a75cb5749062928fa24b3.tar.bz2 podman-2e6bc3c7af261228ae7a75cb5749062928fa24b3.zip | |
Merge pull request #1627 from adrianreber/criu
Add CRIU version check for checkpoint and restore
Diffstat (limited to 'test/e2e/checkpoint_test.go')
| -rw-r--r-- | test/e2e/checkpoint_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 6c5d891a0..928a76324 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -4,6 +4,7 @@ import ( "fmt" "os" + "github.com/containers/libpod/pkg/criu" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -22,10 +23,8 @@ var _ = Describe("Podman checkpoint", func() { } podmanTest = PodmanCreate(tempdir) podmanTest.RestoreAllArtifacts() - // At least CRIU 3.11 is needed - skip, err := podmanTest.isCriuAtLeast(31100) - if err != nil || skip { - Skip("CRIU missing or too old.") + if !criu.CheckForCriu() { + Skip("CRIU is missing or too old.") } }) |