tests: Normalize json before comparing it.

The conmon-v3 produces slightly different json. It is still valid, but
it cannot be matched with the very same strings as the one produced by
the conmon-v2.

This commit normalizes the JSON using `jq` before comparing it and as
a result, these conmon-v2 tests also pass against conmon-v3.

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

Author: jankaluza

test/04-runtime.bats

@@ -89,7 +89,7 @@ teardown() {
     assert_file_exists $TEST_TMPDIR/syncpipe-output
     run cat $TEST_TMPDIR/syncpipe-output
     CONTAINER_PID=$(cat "$PID_FILE")
-    assert "${output}" =~ "\"pid\": $CONTAINER_PID"
+    assert_json "${output}" =~ "\"pid\": $CONTAINER_PID"
 }
 
 @test "runtime: runc error with _OCI_SYNCPIPE defined" {
@@ -121,7 +121,7 @@ teardown() {
     # Check that the error is sent to the sync pipe.
     assert_file_exists $TEST_TMPDIR/syncpipe-output
     run cat $TEST_TMPDIR/syncpipe-output
-    assert "${output}" =~ "\"pid\": -1"
-    assert "${output}" =~ "\"message\":"
-    assert "${output}" =~ "runc create failed"
+    assert_json "${output}" =~ "\"pid\": -1"
+    assert_json "${output}" =~ "\"message\":"
+    assert_json "${output}" =~ "runc create failed"
 }

test/08-exec.bats

@@ -86,7 +86,7 @@ teardown() {
     # Check that the conmon wrote something back.
     assert_file_exists $TEST_TMPDIR/attachpipe-output
     run cat $TEST_TMPDIR/attachpipe-output
-    assert "${output}" =~ '"data": 0'
+    assert_json "${output}" =~ '"data": 0'
 }
 
 @test "exec: --exec-attach with _OCI_STARTPIPE" {
@@ -156,7 +156,7 @@ teardown() {
     # Check that the conmon wrote something back.
     assert_file_exists $TEST_TMPDIR/syncpipe-output
     run cat $TEST_TMPDIR/syncpipe-output
-    assert "${output}" =~ '"exit_code": 0'
+    assert_json "${output}" =~ '"exit_code": 0'
 }
 
 @test "exec: --exec --api-version=1 with _OCI_SYNCPIPE defined" {
@@ -178,7 +178,7 @@ teardown() {
     assert_file_exists $TEST_TMPDIR/syncpipe-output
     run cat $TEST_TMPDIR/syncpipe-output
     CONTAINER_PID=$(cat "$PID_FILE")
-    assert "${output}" =~ "\"data\": $CONTAINER_PID"
-    assert "${output}" =~ '"data": 0'
+    assert_json "${output}" =~ "\"data\": $CONTAINER_PID"
+    assert_json "${output}" =~ '"data": 0'
 }
 

test/test_helper.bash

@@ -643,3 +643,15 @@ function die() {
     echo "#\\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >&2
     bail-now
 }
+
+# Helper function wrapping the `assert`. It expects json as a first
+# argument and normalizes it so it is exactly the same no matter what
+# generated it.
+assert_json() {
+    echo "$1"
+    if ! normalized_json=$(printf '%s' "$1" | jq -S .); then
+        die "Invalid JSON passed to assert_json: $normalized_json"
+    fi
+    echo "$normalized_json"
+    assert "$normalized_json" "$2" "$3" "$4"
+}