Merge pull request #3848 from giuseppe/enable-all-tests-crun

tests: enable all tests for crun

6 files changed, 2 insertions, 30 deletions

diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
index 3f9639fda..ac727f9bc 100644
--- a/test/e2e/exec_test.go
+++ b/test/e2e/exec_test.go
@@ -171,16 +171,14 @@ var _ = Describe("Podman exec", func() {
 
 		session := podmanTest.Podman([]string{"exec", "--workdir", "/missing", "test1", "pwd"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(1))
+		Expect(session.ExitCode()).To(Not(Equal(0)))
 
 		session = podmanTest.Podman([]string{"exec", "-w", "/missing", "test1", "pwd"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(1))
+		Expect(session.ExitCode()).To(Not(Equal(0)))
 	})
 
 	It("podman exec cannot be invoked", func() {
-		SkipIfNotRunc()
-
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
@@ -191,8 +189,6 @@ var _ = Describe("Podman exec", func() {
 	})
 
 	It("podman exec command not found", func() {
-		SkipIfNotRunc()
-
 		setup := podmanTest.RunTopContainer("test1")
 		setup.WaitWithDefaultTimeout()
 		Expect(setup.ExitCode()).To(Equal(0))
diff --git a/test/e2e/libpod_suite_remoteclient_test.go b/test/e2e/libpod_suite_remoteclient_test.go
index a6cedfc58..7f33fec87 100644
--- a/test/e2e/libpod_suite_remoteclient_test.go
+++ b/test/e2e/libpod_suite_remoteclient_test.go
@@ -28,13 +28,6 @@ func SkipIfRootless() {
 	}
 }
 
-func SkipIfNotRunc() {
-	runtime := os.Getenv("OCI_RUNTIME")
-	if runtime != "" && filepath.Base(runtime) != "runc" {
-		ginkgo.Skip("Not using runc as runtime")
-	}
-}
-
 // Podman is the exec call to podman on the filesystem
 func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
 	podmanSession := p.PodmanBase(args, false, false)
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 22cc14d6b..1df59dbe3 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -21,13 +21,6 @@ func SkipIfRootless() {
 	}
 }
 
-func SkipIfNotRunc() {
-	runtime := os.Getenv("OCI_RUNTIME")
-	if runtime != "" && filepath.Base(runtime) != "runc" {
-		ginkgo.Skip("Not using runc as runtime")
-	}
-}
-
 // Podman is the exec call to podman on the filesystem
 func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration {
 	podmanSession := p.PodmanBase(args, false, false)
diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go
index b05849ddb..861d6b3b7 100644
--- a/test/e2e/run_exit_test.go
+++ b/test/e2e/run_exit_test.go
@@ -41,16 +41,12 @@ var _ = Describe("Podman run exit", func() {
 	})
 
 	It("podman run exit 126", func() {
-		SkipIfNotRunc()
-
 		result := podmanTest.Podman([]string{"run", ALPINE, "/etc"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(126))
 	})
 
 	It("podman run exit 127", func() {
-		SkipIfNotRunc()
-
 		result := podmanTest.Podman([]string{"run", ALPINE, "foobar"})
 		result.WaitWithDefaultTimeout()
 		Expect(result.ExitCode()).To(Equal(127))
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index ce2044a72..6e102cfa5 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -417,7 +417,6 @@ var _ = Describe("Podman run", func() {
 
 	It("podman run notify_socket", func() {
 		SkipIfRemote()
-		SkipIfNotRunc()
 
 		host := GetHostDistributionInfo()
 		if host.Distribution != "rhel" && host.Distribution != "centos" && host.Distribution != "fedora" {
@@ -629,7 +628,6 @@ var _ = Describe("Podman run", func() {
 	})
 
 	It("podman run exit code on failure to exec", func() {
-		SkipIfNotRunc()
 		session := podmanTest.Podman([]string{"run", ALPINE, "/etc"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(126))
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index 2dbb9545b..fc1203ed1 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -101,8 +101,6 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman failed to start with --rm should delete the container", func() {
-		SkipIfNotRunc()
-
 		session := podmanTest.Podman([]string{"create", "-it", "--rm", ALPINE, "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -116,8 +114,6 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman failed to start without --rm should NOT delete the container", func() {
-		SkipIfNotRunc()
-
 		session := podmanTest.Podman([]string{"create", "-it", ALPINE, "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))