Merge pull request #2703 from edsantiago/bats

BATS: new tests, and improvements to existing ones

1 files changed, 27 insertions, 0 deletions

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index debec29b6..055865c8d 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -18,7 +18,34 @@ load helpers
     is "$output" "$rand_string" "output from podman-start on created ctr"
     is "$output" "$rand_string" "logs of started container"
 
+    run_podman logs $cid
+    is "$output" "$rand_string" "output from podman-logs after container is run"
+
     run_podman rm $cid
 }
 
+@test "podman logs - multi" {
+    # Simple helper to make the container starts, below, easier to read
+    local -a cid
+    doit() {
+        run_podman run --rm -d --name "$1" $IMAGE sh -c "$2";
+        cid+=($(echo "${output:0:12}"))
+    }
+
+    # Not really a guarantee that we'll get a-b-c-d in order, but it's
+    # the best we can do. The trailing 'sleep' in each container
+    # minimizes the chance of a race condition in which the container
+    # is removed before 'podman logs' has a chance to wake up and read
+    # the final output.
+    doit c1         "echo a;sleep 10;echo d;sleep 3"
+    doit c2 "sleep 1;echo b;sleep  2;echo c;sleep 3"
+
+    run_podman logs -f c1 c2
+    is "$output" \
+       "${cid[0]} a
+${cid[1]} b
+${cid[1]} c
+${cid[0]} d"   "Sequential output from logs"
+}
+
 # vim: filetype=sh