|
 |
304038 |
From 0c4c724109d160e336d38f0a50fd82c9f5184ddb Mon Sep 17 00:00:00 2001
|
|
|
304038 |
From: Karel Zak <kzak@redhat.com>
|
|
|
304038 |
Date: Tue, 17 Oct 2017 12:35:31 +0200
|
|
|
304038 |
Subject: [PATCH 140/141] tests: cleanup fdisk outputs
|
|
|
304038 |
|
|
|
304038 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1454652
|
|
|
304038 |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
304038 |
---
|
|
|
304038 |
tests/expected/fdisk/align-512-4K-md | 6 +++---
|
|
|
304038 |
tests/expected/fdisk/align-512-512 | 16 ++++++++--------
|
|
|
304038 |
tests/ts/fdisk/align-512-512 | 3 +--
|
|
|
304038 |
3 files changed, 12 insertions(+), 13 deletions(-)
|
|
|
304038 |
|
|
|
304038 |
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
|
|
|
304038 |
index e8f6ba161..336c9e019 100644
|
|
|
304038 |
--- a/tests/expected/fdisk/align-512-4K-md
|
|
|
304038 |
+++ b/tests/expected/fdisk/align-512-4K-md
|
|
|
304038 |
@@ -69,7 +69,7 @@ Select (default p): Partition number (2-4, default 2): First sector (22528-10009
|
|
|
304038 |
Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): Partition 2 of type Linux and of size 10 MiB is set
|
|
|
304038 |
|
|
|
304038 |
Command (m for help):
|
|
|
304038 |
-Disk /dev/md8: 51 MB, 51249152 bytes, 100096 sectors
|
|
|
304038 |
+Disk /dev/...: 51 MB, 51249152 bytes, 100096 sectors
|
|
|
304038 |
Units = sectors of 1 * 512 = 512 bytes
|
|
|
304038 |
Sector size (logical/physical): 512 bytes / 4096 bytes
|
|
|
304038 |
I/O size (minimum/optimal): 65536 bytes / <removed> bytes
|
|
|
304038 |
@@ -77,8 +77,8 @@ Disk label type: dos
|
|
|
304038 |
|
|
|
304038 |
|
|
|
304038 |
Device Boot Start End Blocks Id System
|
|
|
304038 |
-/dev/md8p1 2048 22527 10240 83 Linux
|
|
|
304038 |
-/dev/md8p2 22528 43007 10240 83 Linux
|
|
|
304038 |
+/dev/...p1 2048 22527 10240 83 Linux
|
|
|
304038 |
+/dev/...p2 22528 43007 10240 83 Linux
|
|
|
304038 |
|
|
|
304038 |
Command (m for help): The partition table has been altered!
|
|
|
304038 |
|
|
|
304038 |
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
|
|
|
304038 |
index 8e03d900d..f9cbb0e89 100644
|
|
|
304038 |
--- a/tests/expected/fdisk/align-512-512
|
|
|
304038 |
+++ b/tests/expected/fdisk/align-512-512
|
|
|
304038 |
@@ -50,7 +50,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa
|
|
|
304038 |
Partition 7 of type Linux and of size 6 MiB is set
|
|
|
304038 |
|
|
|
304038 |
Command (m for help):
|
|
|
304038 |
-Disk /dev/loop0: 52 MB, 52428800 bytes, 102400 sectors
|
|
|
304038 |
+Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors
|
|
|
304038 |
Units = sectors of 1 * 512 = 512 bytes
|
|
|
304038 |
Sector size (logical/physical): 512 bytes / 512 bytes
|
|
|
304038 |
I/O size (minimum/optimal): 512 bytes / <removed> bytes
|
|
|
304038 |
@@ -58,12 +58,12 @@ Disk label type: dos
|
|
|
304038 |
|
|
|
304038 |
|
|
|
304038 |
Device Boot Start End Blocks Id System
|
|
|
304038 |
-/dev/loop0p1 2048 22527 10240 83 Linux
|
|
|
304038 |
-/dev/loop0p2 22528 43007 10240 83 Linux
|
|
|
304038 |
-/dev/loop0p3 43008 63487 10240 83 Linux
|
|
|
304038 |
-/dev/loop0p4 63488 102399 19456 5 Extended
|
|
|
304038 |
-/dev/loop0p5 65536 75775 5120 83 Linux
|
|
|
304038 |
-/dev/loop0p6 77824 88063 5120 83 Linux
|
|
|
304038 |
-/dev/loop0p7 90112 102399 6144 83 Linux
|
|
|
304038 |
+/dev/...p1 2048 22527 10240 83 Linux
|
|
|
304038 |
+/dev/...p2 22528 43007 10240 83 Linux
|
|
|
304038 |
+/dev/...p3 43008 63487 10240 83 Linux
|
|
|
304038 |
+/dev/...p4 63488 102399 19456 5 Extended
|
|
|
304038 |
+/dev/...p5 65536 75775 5120 83 Linux
|
|
|
304038 |
+/dev/...p6 77824 88063 5120 83 Linux
|
|
|
304038 |
+/dev/...p7 90112 102399 6144 83 Linux
|
|
|
304038 |
|
|
|
304038 |
Command (m for help):
|
|
|
304038 |
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
|
|
|
304038 |
index 82a6268cf..03133a6d1 100755
|
|
|
304038 |
--- a/tests/ts/fdisk/align-512-512
|
|
|
304038 |
+++ b/tests/ts/fdisk/align-512-512
|
|
|
304038 |
@@ -64,7 +64,6 @@ q
|
|
|
304038 |
EOF
|
|
|
304038 |
|
|
|
304038 |
ts_device_deinit $DEVICE
|
|
|
304038 |
-
|
|
|
304038 |
-ts_fdisk_clean
|
|
|
304038 |
+ts_fdisk_clean $DEVICE
|
|
|
304038 |
|
|
|
304038 |
ts_finalize
|
|
|
304038 |
--
|
|
|
304038 |
2.13.6
|
|
|
304038 |
|