Skip / update some tests under runc

Two fixes done in #14972 (the "oops test under runc again" PR
which was not backported into 4.2):

 - "survive service stop" - skip. Test is only applicable
   under crun.
 - "volume exec/noexec" - update the expected error message

One hail-mary fix for a test failure seen in RHEL87 gating:

 - "nonexistent labels" - slight tweak to expected error message

None of these fixes will actually be tested in CI, because v4.2
does not run any runc tests. We'll have to wait and see what
happens on the next RHEL build.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index dfc1a8413..6829c6a78 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -149,16 +149,16 @@ EOF
 
     # By default, volumes are mounted exec, but we have manually added the
     # noexec option. This should fail.
-    # ARGH. Unfortunately, runc (used for cgroups v1) produces a different error
+    # ARGH. Unfortunately, runc (used for cgroups v1) has different exit status
     local expect_rc=126
-    local expect_msg='.* OCI permission denied.*'
     if [[ $(podman_runtime) = "runc" ]]; then
         expect_rc=1
-        expect_msg='.* exec user process caused.*permission denied'
     fi
 
     run_podman ${expect_rc} run --rm --volume $myvolume:/vol:noexec,z $IMAGE /vol/myscript
-    is "$output" "$expect_msg" "run on volume, noexec"
+    # crun and runc emit different messages, and even runc is inconsistent
+    # with itself (output changed some time in 2022?). Deal with all.
+    assert "$output" =~ 'exec.* permission denied' "run on volume, noexec"
 
     # With the default, it should pass
     run_podman run --rm -v $myvolume:/vol:z $IMAGE /vol/myscript