tests: update fdisk formatting

fdisk --list does no more use extra linebreak (\n) before
and after partition table entries.

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

15 files changed, 6 insertions, 46 deletions

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 261f16912..49f93751d 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -64,7 +64,6 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>6       77824  88063   10240   5M 83 Linux
 <removed>7       90112 102399   12288   6M 83 Linux
 
-
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index ee58b3a2a..6e44cfe2b 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -65,7 +65,6 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>6       75775  86014   10240   5M 83 Linux
 <removed>7       88063 102399   14337   7M 83 Linux
 
-
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 87777f774..317865a86 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -30,7 +30,6 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>1        2048  43007   40960  20M 83 Linux
 <removed>2       43008 102399   59392  29M 83 Linux
 
-
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
@@ -70,7 +69,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>p1       2048 22527   20480  10M 83 Linux
 <removed>p2      22528 43007   20480  10M 83 Linux
 
-
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index b4a0e568a..27df57051 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -64,5 +64,4 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>p6      77824  88063   10240   5M 83 Linux
 <removed>p7      90112 102399   12288   6M 83 Linux
 
-
 Command (m for help): 
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 7552656ee..8ae0c4057 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -64,7 +64,6 @@ Device     Boot Start    End Sectors Size Id Type
 <removed>6       77824  88063   10240   5M 83 Linux
 <removed>7       90112 102399   12288   6M 83 Linux
 
-
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 1b54d0939..3ae0cf3c1 100644
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -27,7 +27,6 @@ Disk identifier: <removed>
 
 Device     Boot Start End Cylinders  Size Id Type
 <removed>1          1   1         1  7.8M 83 Linux
-
 -------------------
 
 Set partition type
@@ -44,7 +43,6 @@ Disk identifier: <removed>
 
 Device     Boot Start End Cylinders  Size Id Type
 <removed>1          1   1         1  7.8M bf Solaris
-
 -------------------
 
 Set primary partition active
@@ -61,7 +59,6 @@ Disk identifier: <removed>
 
 Device     Boot Start End Cylinders  Size Id Type
 <removed>1 *        1   1         1  7.8M bf Solaris
-
 -------------------
 
 Re-create primary partition
@@ -78,7 +75,6 @@ Disk identifier: <removed>
 
 Device     Boot Start End Cylinders  Size Id Type
 <removed>1          1   1         1  7.8M 83 Linux
-
 -------------------
 
 Create extended partition
@@ -96,7 +92,6 @@ Disk identifier: <removed>
 Device     Boot Start End Cylinders  Size Id Type
 <removed>1          1   1         1  7.8M 83 Linux
 <removed>2          2  12        12 86.3M  5 Extended
-
 -------------------
 
 Create logical partitions
@@ -118,7 +113,6 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>6          4   5         2 15.7M 83 Linux
 <removed>7          6   7         2 15.7M 83 Linux
 <removed>8          8   9         2 15.7M 83 Linux
-
 -------------------
 
 Delete logical partitions
@@ -137,7 +131,6 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>1          1   1         1  7.8M 83 Linux
 <removed>2          2  12        12 86.3M  5 Extended
 <removed>5          6   7         2 15.7M 83 Linux
-
 -------------------
 
 Create another logical partition
@@ -157,7 +150,6 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>2          2  12        12 86.3M  5 Extended
 <removed>5          6   7         2 15.7M 83 Linux
 <removed>6          2   3         2 15.7M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
@@ -177,7 +169,6 @@ Device     Boot Start End Cylinders  Size Id Type
 <removed>2          2  12        12 86.3M  5 Extended
 <removed>5          6   7         2 15.7M 83 Linux
 <removed>6          2   3         2 15.7M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode
index d24691cd4..cf7081f7f 100644
--- a/tests/expected/fdisk/mbr-nondos-mode
+++ b/tests/expected/fdisk/mbr-nondos-mode
@@ -25,7 +25,6 @@ Disk identifier: <removed>
 
 Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  8191    6144   3M 83 Linux
-
 -------------------
 
 Set primary partition active
@@ -41,7 +40,6 @@ Disk identifier: <removed>
 
 Device     Boot Start   End Sectors Size Id Type
 <removed>1 *     2048  8191    6144   3M 83 Linux
-
 -------------------
 
 Re-create 1st primary partition
@@ -57,7 +55,6 @@ Disk identifier: <removed>
 
 Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  8191    6144   3M 83 Linux
-
 -------------------
 
 Create 2nd primary partition
@@ -74,7 +71,6 @@ Disk identifier: <removed>
 Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  8191    6144   3M 83 Linux
 <removed>2       8192 12287    4096   2M 83 Linux
-
 -------------------
 
 Create extended partition
@@ -92,7 +88,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>1       2048  8191    6144   3M 83 Linux
 <removed>2       8192 12287    4096   2M 83 Linux
 <removed>3      12288 40959   28672  14M  5 Extended
-
 -------------------
 
 Create logical partitions
@@ -114,7 +109,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>6      20480 24575    4096   2M 83 Linux
 <removed>7      26624 30719    4096   2M 83 Linux
 <removed>8      32768 36863    4096   2M 83 Linux
-
 -------------------
 
 Delete logical partitions
@@ -133,7 +127,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>2       8192 12287    4096   2M 83 Linux
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
-
 -------------------
 
 Create another logical partition
@@ -153,7 +146,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
@@ -173,7 +165,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
@@ -192,7 +183,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>3      12288 40959   28672  14M  5 Extended
 <removed>5      26624 30719    4096   2M 83 Linux
 <removed>6      14336 18431    4096   2M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort
index d7fb6aae7..0e316c4d5 100644
--- a/tests/expected/fdisk/mbr-sort
+++ b/tests/expected/fdisk/mbr-sort
@@ -23,7 +23,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>2       2048  4095    2048   1M 83 Linux
 <removed>3       6144  8191    2048   1M 83 Linux
 <removed>4       8192 40959   32768  16M  5 Extended
-
 Partition table entries are not in disk order.
 -------------------
 
@@ -46,7 +45,6 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>6      22528 24575    2048   1M 83 Linux
 <removed>7      18432 20479    2048   1M 83 Linux
 <removed>8      10240 12287    2048   1M 83 Linux
-
 Partition table entries are not in disk order.
 -------------------
 
@@ -69,6 +67,5 @@ Device     Boot Start   End Sectors Size Id Type
 <removed>6      14336 16383    2048   1M 83 Linux
 <removed>7      18432 20479    2048   1M 83 Linux
 <removed>8      22528 24575    2048   1M 83 Linux
-
 -------------------
 
diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index 0ba07c669..d336d55a5 100644
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -1,7 +1,6 @@
 Initialize empty image
 f1c9645dbc14efddc7d8a322685f26eb oddinput.img
 Empty image listing
-
 Disk testimage: 10 MiB, 10485760 bytes, 20480 sectors
 Units: cylinders of 16065 * 512 = 8225280 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel
index 7045b61a7..43214b1d1 100644
--- a/tests/expected/fdisk/sunlabel
+++ b/tests/expected/fdisk/sunlabel
@@ -2,7 +2,6 @@ Initialize empty image
 f1c9645dbc14efddc7d8a322685f26eb sunlabel.img
 Create new SUN partition table
 f050fd2beb99f8d968bf17450f655f06 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -11,7 +10,6 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
 Disklabel type: sun
 Create first partition
 e730c7ec8208601f41963f0485147248 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -21,10 +19,8 @@ Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type         Flags
 <removed>1     1   128       129   4M 83 Linux native      
-
 Set partition sysid
 df75defdb97fbd56222aed18631a22d0 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -34,10 +30,8 @@ Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
 <removed>1     1   128       129   4M  4 SunOS usr      
-
 Set first partition readonly
 da23f66698d9a553162887621d4c7490 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -47,10 +41,8 @@ Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
 <removed>1     1   128       129   4M  4 SunOS usr     r
-
 Set first partition mountable
 3ab76e8491b103eab52b2ae1856c1e30 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -60,7 +52,6 @@ Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
 <removed>1     1   128       129   4M  4 SunOS usr    ur
-
 Create second partition
 
 Welcome to fdisk <removed>.
@@ -75,7 +66,6 @@ Command (m for help): The partition table has been altered.
 Syncing disks.
 
 a87e80830aa13d2d68b766962f052750 sunlabel.img
-
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
 Geometry: 1 heads, 63 sectors/track, 325 cylinders
 Units: cylinders of 63 * 512 = 32256 bytes
@@ -86,6 +76,5 @@ Disklabel type: sun
 Device             Start   End Cylinders  Size Id Type         Flags
 <removed>1     1   128       129    4M  4 SunOS usr       ur
 <removed>2   129   325       198  6.1M 83 Linux native      
-
 Delete all partitions
 502ba7a0cfdce2849c3a99881f0590c3 sunlabel.img
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index d5ec215a4..1d5f9a11a 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -68,13 +68,13 @@ function fdisk_bsd_offset_and_byte_order_clean
 }
 
 function print_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME}  >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
 
 function print_bsd_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	echo -e "${FDISK_CMD_BSD_LIST}" | \
 			$TS_CMD_FDISK ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index 3c174e968..fd9c23e07 100755
--- a/tests/ts/fdisk/gpt
+++ b/tests/ts/fdisk/gpt
@@ -35,7 +35,7 @@ FDISK_CMD_DELETE_PART="d\n2\n"               # delete 2nd partition
 FDISK_CMD_CREATE_PART="n\n2\n\n\n"           # create 2nd partition
 
 function print_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} &>> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 6d517ea3e..4fad8da77 100755
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -39,7 +39,7 @@ FDISK_CMD_DELETE_EXTENDED="d\n2\n" # delete second primary
 FDISK_OPTIONS="-C 1024 -c=dos -u=cylinders"
 
 function print_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 9c38f3aff..f39b5e0f0 100755
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -37,7 +37,7 @@ FDISK_CMD_DELETE_2PRIMARY="d\n2\n" # delete first primary
 FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary
 
 function print_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort
index 3166d867b..2cdb11557 100755
--- a/tests/ts/fdisk/mbr-sort
+++ b/tests/ts/fdisk/mbr-sort
@@ -39,7 +39,7 @@ FDISK_CMD_CREATE_4LOGICAL="n\n10240\n12287\n"
 FDISK_CMD_EXPERT_SORT="x\nf\nr\n"
 
 function print_layout {
-	echo -ne "\n---layout----------" >> $TS_OUTPUT
+	echo -ne "\n---layout----------\n" >> $TS_OUTPUT
 	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }