From a14155917baa577bebbbc0c5983a7a90bf35c2b5 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 2 Oct 2018 14:28:46 +0000 Subject: 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 --- test/e2e/checkpoint_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'test/e2e/checkpoint_test.go') 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.") } }) -- cgit v1.2.3-54-g00ecf