tests: use subtests in fdisk/mbr-nondos-mode

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

1 files changed, 39 insertions, 18 deletions

diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 3ae25ba1f..d3b35fa39 100755
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -54,10 +54,13 @@ function print_layout {
 	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
+
+	ts_fdisk_clean ${TEST_IMAGE_NAME}
 }
 
 #set -x
 
+ts_init_subtest "empty-pt"
 ts_log "Initialize empty image"
 TEST_IMAGE_NAME=$(ts_image_init 20)	# 20 MiB
 ts_image_md5sum >> $TS_OUTPUT 2>&1
@@ -68,105 +71,123 @@ ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
+
+ts_init_subtest "1st-primary"
 ts_log "Create 1st primary partition"
 echo -e "${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
+
+ts_init_subtest "1st-active"
 ts_log "Set primary partition active"
 echo -e "${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "1st-primary-recreate"
 ts_log "Re-create 1st primary partition"
 echo -e "d\n${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "2nd-primary"
 ts_log "Create 2nd primary partition"
 echo -e "${FDISK_CMD_CREATE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "extended"
 ts_log "Create extended partition"
 echo -e "${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK  ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "logical"
 ts_log "Create logical partitions"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
+
+ts_init_subtest "logical-delete"
 ts_log "Delete logical partitions"
 echo -e "${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
 
+ts_init_subtest "logical-recreate"
 ts_log "Create another logical partition"
 echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "1st-primary-delete"
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_DELETE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
+
 
+ts_init_subtest "1nd-primary-delete"
 ts_log "Delete primary partition"
 echo -e "${FDISK_CMD_DELETE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
+
+ts_init_subtest "extended-delete"
 ts_log "Delete extended partition"
 echo -e "${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \
 	| $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>&1
-
 print_layout
+ts_finalize_subtest
 
-# Create a new layout
-#
+
+ts_init_subtest "first-sector-at-end"
 ts_log "Create new DOS partition table (again)"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
 	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-
 ts_log "Create 1st primary at the end of device"
 echo -e "n\np\n1\n20000\n\n${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
-
 print_layout
 
 ts_log "Create 2nd primary at the begin of device"
 echo -e "n\np\n2\n\n\n${FDISK_CMD_WRITE_CLOSE}" | \
 	$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> $TS_OUTPUT
-
 print_layout
+ts_finalize_subtest
 
-ts_fdisk_clean ${TEST_IMAGE_NAME}
 
 ts_finalize