tests: use sub-tests for dm-verity

* write error to the test log file rather than on stdout
* use sub-tests to get more info on output
* don't use ts_die in sub-tests to make sure we call final dmsetup remove

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/mount/dm-verity b/tests/expected/mount/dm-verity
index 35821117c875783dd71b802f8d48510ad857b74f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/tests/expected/mount/dm-verity
+++ b/tests/expected/mount/dm-verity
@@ -1 +0,0 @@
-Success

diff --git a/tests/ts/mount/dm-verity b/tests/ts/mount/dm-verity
index c0c70fe5c7e64185b3e1ee88b512a5c2a2832116..4babbbf4e5cee563e08364f0a6ed4e86a80d315f 100755 (executable)
--- a/tests/ts/mount/dm-verity
+++ b/tests/ts/mount/dm-verity
@@ -46,21 +46,27 @@ HASH=$(cat $VERITY_OUTPUT |  awk '/Root hash:/ { print $3 }')  || ts_die "error:
 echo $HASH > $ROOT_HASH_FILE
 # Activate verity data device
 veritysetup create $VERITY_DEVICE $SQUASHFS $HASH_DEVICE $HASH  || ts_skip "cannot activate verity device"
+
+
+ts_init_subtest "roothash"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+$TS_CMD_MOUNT -o verity.hashdevice=$HASH_DEVICE,verity.roothash=$HASH,verity.hashoffset=0 \
+    $VERITY_DEVICE_ABS \
+    $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT -l $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_finalize_subtest
 
-# Variant A - using verity.roothash
-$TS_CMD_MOUNT -o verity.hashdevice=$HASH_DEVICE,verity.roothash=$HASH,verity.hashoffset=0 $VERITY_DEVICE_ABS\
-    $TS_MOUNTPOINT || ts_die "error: mount"
-$TS_CMD_UMOUNT -l $TS_MOUNTPOINT || ts_die "error: umount"
 
-# Variant B - using verity.roothashfile
-$TS_CMD_MOUNT -o verity.hashdevice=$HASH_DEVICE,verity.roothashfile=$ROOT_HASH_FILE $VERITY_DEVICE_ABS\
-    $TS_MOUNTPOINT || ts_die "error: mount"
-$TS_CMD_UMOUNT -l $TS_MOUNTPOINT || ts_die "error: umount"
+ts_init_subtest "roothashfile"
+[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+$TS_CMD_MOUNT -o verity.hashdevice=$HASH_DEVICE,verity.roothashfile=$ROOT_HASH_FILE \
+    $VERITY_DEVICE_ABS \
+    $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_UMOUNT -l $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ts_finalize_subtest
 
 
 # Cleanup
 dmsetup remove -f $VERITY_DEVICE
 
-ts_log "Success"
 ts_finalize