From 777c1593538697646d9bd8c34a52a7bb32b863bf Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 27 Feb 2019 12:22:33 +0100 Subject: tests: use subtests in fdisk/mbr-nondos-mode Signed-off-by: Karel Zak --- tests/expected/fdisk/mbr-nondos-mode | 250 --------------------- .../fdisk/mbr-nondos-mode-1nd-primary-delete | 19 ++ tests/expected/fdisk/mbr-nondos-mode-1st-active | 15 ++ tests/expected/fdisk/mbr-nondos-mode-1st-primary | 15 ++ .../fdisk/mbr-nondos-mode-1st-primary-delete | 20 ++ .../fdisk/mbr-nondos-mode-1st-primary-recreate | 15 ++ tests/expected/fdisk/mbr-nondos-mode-2nd-primary | 16 ++ tests/expected/fdisk/mbr-nondos-mode-empty-pt | 14 ++ tests/expected/fdisk/mbr-nondos-mode-extended | 17 ++ .../expected/fdisk/mbr-nondos-mode-extended-delete | 12 + .../fdisk/mbr-nondos-mode-first-sector-at-end | 47 ++++ tests/expected/fdisk/mbr-nondos-mode-logical | 21 ++ .../expected/fdisk/mbr-nondos-mode-logical-delete | 18 ++ .../fdisk/mbr-nondos-mode-logical-recreate | 21 ++ tests/ts/fdisk/mbr-nondos-mode | 57 +++-- 15 files changed, 289 insertions(+), 268 deletions(-) delete mode 100644 tests/expected/fdisk/mbr-nondos-mode create mode 100644 tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete create mode 100644 tests/expected/fdisk/mbr-nondos-mode-1st-active create mode 100644 tests/expected/fdisk/mbr-nondos-mode-1st-primary create mode 100644 tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete create mode 100644 tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate create mode 100644 tests/expected/fdisk/mbr-nondos-mode-2nd-primary create mode 100644 tests/expected/fdisk/mbr-nondos-mode-empty-pt create mode 100644 tests/expected/fdisk/mbr-nondos-mode-extended create mode 100644 tests/expected/fdisk/mbr-nondos-mode-extended-delete create mode 100644 tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end create mode 100644 tests/expected/fdisk/mbr-nondos-mode-logical create mode 100644 tests/expected/fdisk/mbr-nondos-mode-logical-delete create mode 100644 tests/expected/fdisk/mbr-nondos-mode-logical-recreate diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode deleted file mode 100644 index 28d98d22f..000000000 --- a/tests/expected/fdisk/mbr-nondos-mode +++ /dev/null @@ -1,250 +0,0 @@ -Initialize empty image -8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img -Create new DOS partition table -4e23561dcb81678bb1bd678722c7cbb7 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: -------------------- - -Create 1st primary partition -e21e16b7452d82e2a2810a1de8c3db05 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -------------------- - -Set primary partition active -47f024f3b406598a0159400af7382e2c mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 * 2048 8191 6144 3M 83 Linux -------------------- - -Re-create 1st primary partition -a5543ee1e3d2cf79913a56bae893a0f0 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -------------------- - -Create 2nd primary partition -9d31ee977e26e72ebce78e8e543cd4ce mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -2 8192 12287 4096 2M 83 Linux -------------------- - -Create extended partition -9528631b198e44564f67f8ca97fa51b8 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -2 8192 12287 4096 2M 83 Linux -3 12288 40959 28672 14M 5 Extended -------------------- - -Create logical partitions -db4406e7bc0773f234fd1db1b58b5997 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -2 8192 12287 4096 2M 83 Linux -3 12288 40959 28672 14M 5 Extended -5 14336 18431 4096 2M 83 Linux -6 20480 24575 4096 2M 83 Linux -7 26624 30719 4096 2M 83 Linux -8 32768 36863 4096 2M 83 Linux -------------------- - -Delete logical partitions -de85b8d74f52f307b9467ea4c33438cb mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -2 8192 12287 4096 2M 83 Linux -3 12288 40959 28672 14M 5 Extended -5 26624 30719 4096 2M 83 Linux -------------------- - -Create another logical partition -28d0cbe795535ee025dc7a4781516965 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 2048 8191 6144 3M 83 Linux -2 8192 12287 4096 2M 83 Linux -3 12288 40959 28672 14M 5 Extended -5 26624 30719 4096 2M 83 Linux -6 14336 18431 4096 2M 83 Linux - -Partition table entries are not in disk order. -------------------- - -Delete primary partition -6f1b62718cf8d83602d51de8944cee51 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -2 8192 12287 4096 2M 83 Linux -3 12288 40959 28672 14M 5 Extended -5 26624 30719 4096 2M 83 Linux -6 14336 18431 4096 2M 83 Linux - -Partition table entries are not in disk order. -------------------- - -Delete primary partition -7b29a3cda33e990e8a7877b81988b933 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -3 12288 40959 28672 14M 5 Extended -5 26624 30719 4096 2M 83 Linux -6 14336 18431 4096 2M 83 Linux - -Partition table entries are not in disk order. -------------------- - -Delete extended partition -e1ef48d3d42f4ebcfd5bf4baf5e370e9 mbr-nondos-mode.img - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: -------------------- - -Create new DOS partition table (again) -Create 1st primary at the end of device - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 20000 40959 20960 10.2M 83 Linux -------------------- - -Create 2nd primary at the begin of device - -Welcome to fdisk . -Changes will remain in memory only, until you decide to write them. -Be careful before using the write command. - - -Command (m for help): Partition type - p primary (1 primary, 0 extended, 3 free) - e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (2048-19999, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-19999, default 19999): -Created a new . - -Command (m for help): The partition table has been altered. -Syncing disks. - - ----layout---------- -Disk : 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / bytes -Disklabel type: dos -Disk identifier: - -Device Boot Start End Sectors Size Id Type -1 20000 40959 20960 10.2M 83 Linux -2 2048 19999 17952 8.8M 83 Linux - -Partition table entries are not in disk order. -------------------- - diff --git a/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete b/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete new file mode 100644 index 000000000..cc5e1f0f5 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete @@ -0,0 +1,19 @@ +Delete primary partition +7b29a3cda33e990e8a7877b81988b933 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux + +Partition table entries are not in disk order. +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-active b/tests/expected/fdisk/mbr-nondos-mode-1st-active new file mode 100644 index 000000000..76b761a80 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-1st-active @@ -0,0 +1,15 @@ +Set primary partition active +47f024f3b406598a0159400af7382e2c mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 * 2048 8191 6144 3M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary b/tests/expected/fdisk/mbr-nondos-mode-1st-primary new file mode 100644 index 000000000..df4bf2ef0 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary @@ -0,0 +1,15 @@ +Create 1st primary partition +e21e16b7452d82e2a2810a1de8c3db05 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete new file mode 100644 index 000000000..7fce4e4af --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete @@ -0,0 +1,20 @@ +Delete primary partition +6f1b62718cf8d83602d51de8944cee51 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux + +Partition table entries are not in disk order. +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate new file mode 100644 index 000000000..80e00790b --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate @@ -0,0 +1,15 @@ +Re-create 1st primary partition +a5543ee1e3d2cf79913a56bae893a0f0 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-2nd-primary b/tests/expected/fdisk/mbr-nondos-mode-2nd-primary new file mode 100644 index 000000000..0b24808ad --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-2nd-primary @@ -0,0 +1,16 @@ +Create 2nd primary partition +9d31ee977e26e72ebce78e8e543cd4ce mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-empty-pt b/tests/expected/fdisk/mbr-nondos-mode-empty-pt new file mode 100644 index 000000000..bc18a706e --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-empty-pt @@ -0,0 +1,14 @@ +Initialize empty image +8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img +Create new DOS partition table +4e23561dcb81678bb1bd678722c7cbb7 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-extended b/tests/expected/fdisk/mbr-nondos-mode-extended new file mode 100644 index 000000000..3b8c736aa --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-extended @@ -0,0 +1,17 @@ +Create extended partition +9528631b198e44564f67f8ca97fa51b8 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-extended-delete b/tests/expected/fdisk/mbr-nondos-mode-extended-delete new file mode 100644 index 000000000..b4672740b --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-extended-delete @@ -0,0 +1,12 @@ +Delete extended partition +e1ef48d3d42f4ebcfd5bf4baf5e370e9 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end new file mode 100644 index 000000000..4efd2a287 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end @@ -0,0 +1,47 @@ +Create new DOS partition table (again) +Create 1st primary at the end of device + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 20000 40959 20960 10.2M 83 Linux +------------------- + +Create 2nd primary at the begin of device + +Welcome to fdisk . +Changes will remain in memory only, until you decide to write them. +Be careful before using the write command. + + +Command (m for help): Partition type + p primary (1 primary, 0 extended, 3 free) + e extended (container for logical partitions) +Select (default p): Partition number (2-4, default 2): First sector (2048-19999, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-19999, default 19999): +Created a new . + +Command (m for help): The partition table has been altered. +Syncing disks. + + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 20000 40959 20960 10.2M 83 Linux +2 2048 19999 17952 8.8M 83 Linux + +Partition table entries are not in disk order. +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical b/tests/expected/fdisk/mbr-nondos-mode-logical new file mode 100644 index 000000000..ee98105eb --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-logical @@ -0,0 +1,21 @@ +Create logical partitions +db4406e7bc0773f234fd1db1b58b5997 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 14336 18431 4096 2M 83 Linux +6 20480 24575 4096 2M 83 Linux +7 26624 30719 4096 2M 83 Linux +8 32768 36863 4096 2M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical-delete b/tests/expected/fdisk/mbr-nondos-mode-logical-delete new file mode 100644 index 000000000..ca9cd49d1 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-logical-delete @@ -0,0 +1,18 @@ +Delete logical partitions +de85b8d74f52f307b9467ea4c33438cb mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +------------------- + diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical-recreate b/tests/expected/fdisk/mbr-nondos-mode-logical-recreate new file mode 100644 index 000000000..3b16015d8 --- /dev/null +++ b/tests/expected/fdisk/mbr-nondos-mode-logical-recreate @@ -0,0 +1,21 @@ +Create another logical partition +28d0cbe795535ee025dc7a4781516965 mbr-nondos-mode.img + +---layout---------- +Disk : 20 MiB, 20971520 bytes, 40960 sectors +Units: sectors of 1 * 512 = 512 bytes +Sector size (logical/physical): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes +Disklabel type: dos +Disk identifier: + +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux + +Partition table entries are not in disk order. +------------------- + 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 -- cgit v1.2.3-55-g7522