system tests: add assert(), and start using it

Problem: the system test 'is()' checker was poorly thought out.
For example, there is no way to check for inequality or for
absence of a substring.

Solution, step 1: introduce new assert(), copied almost verbatim
from buildah, where it has been successful in addressing the
gaps in is().

The logical next step is to search the tests for 'die' and
for 'run', looking for negative assertions which we can
replace with assert(). There were a lot, and in the process
I found a number of ugly bugs in the tests themselves. I've
taken the liberty of fixing these.

Important note: at this time we have both assert() and is().
Replacing all instances of is() would be impossible to review.

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 16 insertions, 26 deletions

diff --git a/test/system/190-run-ipcns.bats b/test/system/190-run-ipcns.bats
index 9327d8ec7..db1d716d7 100644
--- a/test/system/190-run-ipcns.bats
+++ b/test/system/190-run-ipcns.bats
@@ -7,30 +7,25 @@
 load helpers
 
 @test "podman --ipc=host" {
-    run readlink /proc/self/ns/ipc
-    hostipc=$output
+    hostipc="$(readlink /proc/self/ns/ipc)"
     run_podman run --rm --ipc=host $IMAGE readlink /proc/self/ns/ipc
     is "$output" "$hostipc" "HostIPC and container IPC should be same"
 }
 
 @test "podman --ipc=none" {
-    run readlink /proc/self/ns/ipc
-    hostipc=$output
+    hostipc="$(readlink /proc/self/ns/ipc)"
     run_podman run --rm --ipc=none $IMAGE readlink /proc/self/ns/ipc
-    if [[ $output == "$hostipc" ]]; then
-       die "hostipc and containeripc should be different"
-    fi
+    assert "$output" != "$hostipc" "containeripc should != hostipc"
+
     run_podman 1 run --rm --ipc=none $IMAGE ls /dev/shm
     is "$output" "ls: /dev/shm: No such file or directory" "Should fail with missing /dev/shm"
 }
 
 @test "podman --ipc=private" {
-    run readlink /proc/self/ns/ipc
-    hostipc=$output
+    hostipc="$(readlink /proc/self/ns/ipc)"
     run_podman run -d --ipc=private --name test $IMAGE sleep 100
-    if [[ $output == "$hostipc" ]]; then
-       die "hostipc and containeripc should be different"
-    fi
+    assert "$output" != "$hostipc" "containeripc should != hostipc"
+
     run_podman 125 run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
     is "$output" ".*is not allowed: non-shareable IPC (hint: use IpcMode:shareable for the donor container)" "Containers should not share private ipc namespace"
     run_podman stop -t 0 test
@@ -38,31 +33,26 @@ load helpers
 }
 
 @test "podman --ipc=shareable" {
-    run readlink /proc/self/ns/ipc
-    hostipc=$output
+    hostipc="$(readlink /proc/self/ns/ipc)"
     run_podman run -d --ipc=shareable --name test $IMAGE sleep 100
-    if [[ $output == "$hostipc" ]]; then
-       die "hostipc and containeripc should be different"
-    fi
+    assert "$output" != "$hostipc" "containeripc(shareable) should != hostipc"
+
     run_podman run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
-    if [[ $output == "$hostipc" ]]; then
-       die "hostipc and containeripc should be different"
-    fi
+    assert "$output" != "$hostipc" "containeripc(:test) should != hostipc"
+
     run_podman stop -t 0 test
     run_podman rm test
 }
 
 @test "podman --ipc=container@test" {
-    run readlink /proc/self/ns/ipc
-    hostipc=$output
+    hostipc="$(readlink /proc/self/ns/ipc)"
     run_podman run -d --name test $IMAGE sleep 100
     run_podman exec test readlink /proc/self/ns/ipc
-    if [[ $output == "$hostipc" ]]; then
-       die "hostipc and containeripc should be different"
-    fi
+    assert "$output" != "$hostipc" "containeripc(exec) should != hostipc"
+
     testipc=$output
     run_podman run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
-    is "$output" "$testipc" "Containers should share ipc namespace"
+    assert "$output" = "$testipc" "Containers should share ipc namespace"
     run_podman stop -t 0 test
     run_podman rm test
 }