3 files changed, 44 insertions, 11 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 35107f0a0..5d44c373f 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -10,16 +10,18 @@ function setup() {
     :
 }
 
-@test "podman --context emits reasonable output" {
-    run_podman 125 --context=swarm version
-    is "$output" "Error: Podman does not support swarm, the only --context value allowed is \"default\"" "--context=default or fail"
-
-    run_podman --context=default version
-}
+#### DO NOT ADD ANY TESTS HERE! ADD NEW TESTS AT BOTTOM!
 
 @test "podman version emits reasonable output" {
     run_podman version
 
+    # FIXME FIXME FIXME: #10248: nasty message on Ubuntu cgroups v1, rootless
+    if [[ "$output" =~ "overlay test mount with multiple lowers failed" ]]; then
+        if is_rootless; then
+            lines=("${lines[@]:1}")
+        fi
+    fi
+
     # First line of podman-remote is "Client:<blank>".
     # Just delete it (i.e. remove the first entry from the 'lines' array)
     if is_remote; then
@@ -41,6 +43,17 @@ function setup() {
 }
 
 
+@test "podman --context emits reasonable output" {
+    # All we care about here is that the command passes
+    run_podman --context=default version
+
+    # This one must fail
+    run_podman 125 --context=swarm version
+    is "$output" \
+       "Error: Podman does not support swarm, the only --context value allowed is \"default\"" \
+       "--context=default or fail"
+}
+
 @test "podman can pull an image" {
     run_podman pull $IMAGE
 }
diff --git a/test/system/045-start.bats b/test/system/045-start.bats
index ff818e51d..542f9d1c2 100644
--- a/test/system/045-start.bats
+++ b/test/system/045-start.bats
@@ -40,4 +40,21 @@ load helpers
     fi
 }
 
+@test "podman start --filter - start only containers that match the filter" {
+    run_podman run -d $IMAGE /bin/true
+    cid="$output"
+    run_podman start --filter restart-policy=always $cid "CID of restart-policy=always container"
+    is "$output" ""
+
+    run_podman start --filter restart-policy=none $cid "CID of restart-policy=none container"
+    is "$output" "$cid"
+}
+
+@test "podman start --filter invalid-restart-policy - return error" {
+    run_podman run -d $IMAGE /bin/true
+    cid="$output"
+    run_podman 125 start --filter restart-policy=fakepolicy $cid "CID of restart-policy=<not-exists> container"
+    is "$output" "Error: fakepolicy invalid restart policy"
+}
+
 # vim: filetype=sh
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats
index 95233c1e6..f8cee0e59 100644
--- a/test/system/410-selinux.bats
+++ b/test/system/410-selinux.bats
@@ -198,20 +198,23 @@ function check_label() {
     skip_if_no_selinux
 
     LABEL="system_u:object_r:tmp_t:s0"
+    RELABEL="system_u:object_r:container_file_t:s0"
     tmpdir=$PODMAN_TMPDIR/vol
     touch $tmpdir
     chcon -vR ${LABEL} $tmpdir
     ls -Z $tmpdir
 
     run_podman run -v $tmpdir:/test $IMAGE cat /proc/self/attr/current
-    level=$(secon -l $output)
     run ls -dZ ${tmpdir}
     is "$output" ${LABEL} "No Relabel Correctly"
 
-    run_podman run -v $tmpdir:/test:Z --security-opt label=disable $IMAGE cat /proc/self/attr/current
-    level=$(secon -l $output)
+    run_podman run -v $tmpdir:/test:z --security-opt label=disable $IMAGE cat /proc/self/attr/current
+    run ls -dZ $tmpdir
+    is "$output" ${RELABEL} "Privileged Relabel Correctly"
+
+    run_podman run -v $tmpdir:/test:z --privileged $IMAGE cat /proc/self/attr/current
     run ls -dZ $tmpdir
-    is "$output" ${LABEL} "No Privileged Relabel Correctly"
+    is "$output" ${RELABEL} "Privileged Relabel Correctly"
 
     run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current
     level=$(secon -l $output)
@@ -220,7 +223,7 @@ function check_label() {
 
     run_podman run -v $tmpdir:/test:z $IMAGE cat /proc/self/attr/current
     run ls -dZ $tmpdir
-    is "$output" "system_u:object_r:container_file_t:s0" "Shared Relabel Correctly"
+    is "$output" ${RELABEL} "Shared Relabel Correctly"
 }
 
 # vim: filetype=sh