diff options
| author | Adrian Reber <areber@redhat.com> | 2018-10-02 14:28:46 +0000 |
|---|---|---|
| committer | Adrian Reber <adrian@lisas.de> | 2018-10-23 12:52:03 +0200 |
| commit | a14155917baa577bebbbc0c5983a7a90bf35c2b5 (patch) | |
| tree | 0e48463fc2828e1da2cb98825fb799f631243767 /test/e2e/checkpoint_test.go | |
| parent | 8f6fb79ba88c4f325eff95940dd050da1f69153b (diff) | |
| download | podman-a14155917baa577bebbbc0c5983a7a90bf35c2b5.tar.gz podman-a14155917baa577bebbbc0c5983a7a90bf35c2b5.tar.bz2 podman-a14155917baa577bebbbc0c5983a7a90bf35c2b5.zip | |
tests: use existing CRIU version check
Do not re-implement the CRIU version check in the test suite, use it
from libpod/pkg/criu.
Signed-off-by: Adrian Reber <areber@redhat.com>
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.") } }) |