4 files changed, 44 insertions, 7 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index d276cfda1..081bb1171 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -10,6 +10,13 @@ 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
+}
+
 @test "podman version emits reasonable output" {
     run_podman version
 
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index 7452c1901..c0af2e937 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -53,4 +53,13 @@ store.imageStore.number   | 1
 
 }
 
+@test "podman info --storage-opt='' " {
+    skip_if_remote "--storage-opt flag is not supported for remote"
+    skip_if_rootless "storage opts are required for rootless running"
+    run_podman --storage-opt='' info
+    # Note this will not work in rootless mode, unless you specify
+    # storage-driver=vfs, until we have kernels that support rootless overlay
+    # mounts.
+    is "$output" ".*graphOptions: {}" "output includes graphOptions: {}"
+}
 # vim: filetype=sh
diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats
index 4a2c7b7a4..8a690fb48 100644
--- a/test/system/410-selinux.bats
+++ b/test/system/410-selinux.bats
@@ -191,5 +191,33 @@ function check_label() {
     is "$output" "Error.*: \`/proc/thread-self/attr/exec\`: OCI runtime error: unable to assign security attribute" "useful diagnostic"
 }
 
+@test "podman selinux: check relabel" {
+    skip_if_no_selinux
+
+    LABEL="system_u:object_r:tmp_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 ls -dZ $tmpdir
+    is "$output" ${LABEL} "No Privileged Relabel Correctly"
+
+    run_podman run -v $tmpdir:/test:Z $IMAGE cat /proc/self/attr/current
+    level=$(secon -l $output)
+    run ls -dZ $tmpdir
+    is "$output" "system_u:object_r:container_file_t:$level" "Confined Relabel Correctly"
+
+    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"
+}
 
 # vim: filetype=sh
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 4868ad6a0..804dd46b1 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -143,13 +143,6 @@ load helpers
 
     run_podman network rm $mynetname
     run_podman 1 network rm $mynetname
-
-    # rootless CNI leaves behind an image pulled by SHA, hence with no tag.
-    # Remove it if present; we can only remove it by ID.
-    run_podman images --format '{{.Id}}' rootless-cni-infra
-    if [ -n "$output" ]; then
-        run_podman rmi $output
-    fi
 }
 
 @test "podman network reload" {