Merge pull request #22834 from giuseppe/simplify-seccomp-error

tests: simplify expected output

test/e2e/run_seccomp_test.go

@@ -1,6 +1,9 @@
 package integration
 
 import (
+	"fmt"
+	"path/filepath"
+
 	. "github.com/containers/podman/v5/test/utils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -33,17 +36,20 @@ var _ = Describe("Podman run", func() {
 		// TODO: we're getting a "cannot start a container that has
 		//       stopped" error which seems surprising.  Investigate
 		//       why that is so.
-		if podmanTest.OCIRuntime == "runc" {
+		base := filepath.Base(podmanTest.OCIRuntime)
+		if base == "runc" {
 			// TODO: worse than that. With runc, we get two alternating failures:
 			//   126 + cannot start a container that has stopped
 			//   127 + failed to connect to container's attach socket ... ENOENT
 			Expect(session.ExitCode()).To(BeNumerically(">=", 126), "Exit status using runc")
-		} else {
-			expect := "OCI runtime error: crun: read from the init process"
+		} else if base == "crun" {
+			expect := fmt.Sprintf("OCI runtime error: %s: read from the init process", podmanTest.OCIRuntime)
 			if IsRemote() {
-				expect = "for attach: crun: read from the init process: OCI runtime error"
+				expect = fmt.Sprintf("for attach: %s: read from the init process: OCI runtime error", podmanTest.OCIRuntime)
 			}
 			Expect(session).To(ExitWithError(126, expect))
+		} else {
+			Skip("Not valid with the current OCI runtime")
 		}
 	})