4 files changed, 59 insertions, 3 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 28dc7c7a7..9f4037730 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -460,4 +460,17 @@ json-file | f
     is "$output" "$expect" "podman run with --tz=local, matches host"
 }
 
+# run with --runtime should preserve the named runtime
+@test "podman run : full path to --runtime is preserved" {
+    skip_if_cgroupsv1
+    skip_if_remote
+    run_podman run -d --runtime '/usr/bin/crun' $IMAGE sleep 60
+    cid="$output"
+
+    run_podman inspect --format '{{.OCIRuntime}}' $cid
+    is "$output" "/usr/bin/crun"
+
+    run_podman kill $cid
+}
+
 # vim: filetype=sh
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index 7176ae4b8..0107114b5 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -41,11 +41,14 @@ load helpers
     run_podman create --name $rand $IMAGE /bin/true
 
     # Create a container that podman does not know about
-    run buildah from $IMAGE
-    cid="$output"
+    external_cid=$(buildah from $IMAGE)
+
+    # Plain 'exists' should fail, but should succeed with --external
+    run_podman 1 container exists $external_cid
+    run_podman container exists --external $external_cid
 
     # rm should succeed
-    run_podman rm $rand $cid
+    run_podman rm $rand $external_cid
 }
 
 # I'm sorry! This test takes 13 seconds. There's not much I can do about it,
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats
index 01ec5430e..1277f9bbe 100644
--- a/test/system/140-diff.bats
+++ b/test/system/140-diff.bats
@@ -32,4 +32,26 @@ load helpers
     run_podman rm $n
 }
 
+@test "podman diff with buildah container " {
+    rand_file=$(random_string 10)
+    buildah from --name buildahctr $IMAGE
+    buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services"
+
+    run_podman diff --format json buildahctr
+
+    # Expected results for each type of diff
+    declare -A expect=(
+        [added]="/$rand_file"
+        [changed]="/etc"
+        [deleted]="/etc/services"
+    )
+
+    for field in ${!expect[@]}; do
+        result=$(jq -r -c ".${field}[]" <<<"$output")
+        is "$result" "${expect[$field]}" "$field"
+    done
+
+    buildah rm buildahctr
+}
+
 # vim: filetype=sh
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 4591c9015..2cced10c2 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -34,6 +34,14 @@ function basic_setup() {
     # Clean up all containers
     run_podman rm --all --force
 
+    # ...including external (buildah) ones
+    run_podman ps --all --external --format '{{.ID}} {{.Names}}'
+    for line in "${lines[@]}"; do
+        set $line
+        echo "# setup(): removing stray external container $1 ($2)" >&3
+        run_podman rm $1
+    done
+
     # Clean up all images except those desired
     found_needed_image=
     run_podman images --all --format '{{.Repository}}:{{.Tag}} {{.ID}}'
@@ -245,6 +253,7 @@ function is_cgroupsv1() {
     ! is_cgroupsv2
 }
 
+# True if cgroups v2 are enabled
 function is_cgroupsv2() {
     cgroup_type=$(stat -f -c %T /sys/fs/cgroup)
     test "$cgroup_type" = "cgroup2fs"
@@ -297,6 +306,15 @@ function skip_if_no_selinux() {
     fi
 }
 
+#######################
+#  skip_if_cgroupsv1  #  ...with an optional message
+#######################
+function skip_if_cgroupsv1() {
+    if ! is_cgroupsv2; then
+        skip "${1:-test requires cgroupsv2}"
+    fi
+}
+
 #########
 #  die  #  Abort with helpful message
 #########