Merge pull request #7908 from rhatdan/diff

fix podman container exists and diff for storage containers

2 files changed, 42 insertions, 0 deletions

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 28dc7c7a7..f7c48da8d 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -460,4 +460,24 @@ json-file | f
     is "$output" "$expect" "podman run with --tz=local, matches host"
 }
 
+@test "podman container exists" {
+    rand=$(random_string 30)
+    run_podman 1 container exists myctr
+
+    run_podman create --name myctr $IMAGE /bin/true
+    run_podman container exists myctr
+
+    # Create a container that podman does not know about
+    run buildah from $IMAGE
+    cid="$output"
+
+    # exists should fail
+    run_podman 1 container exists $cid
+
+    # exists should succeed
+    run_podman container exists --external $cid
+
+    run buildah rm $cid
+}
+
 # vim: filetype=sh
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats
index 01ec5430e..d0f33e438 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)
+    run buildah from --name buildahctr $IMAGE
+    run 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
+
+    run buildah rm buildahctr
+}
+
 # vim: filetype=sh