From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Mar 2020 09:48:55 +0000 (+0100)
Subject: Revert "tests: fixes fdisk/align-512-* tests"
X-Git-Tag: v2.36-rc1~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3c90e91727e137980805daaace67124fe110302;p=thirdparty%2Futil-linux.git

Revert "tests: fixes fdisk/align-512-* tests"

This reverts commit 25f5c514b95e1bf55d5f4bb1717fe2ec7e09d63b.
---

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 26ba8ecfb0..e6aa145c9d 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -6,11 +6,6 @@ Be careful before using the write command.
 
 Device does not contain a recognized partition table.
 Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-
-Command (m for help): Created a new <removed>.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 50b9125b9f..831e7dc989 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -6,11 +6,6 @@ Be careful before using the write command.
 
 Device does not contain a recognized partition table.
 Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-
-Command (m for help): Created a new <removed>.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index d14e2e9271..083641f471 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -6,11 +6,6 @@ Be careful before using the write command.
 
 Device does not contain a recognized partition table.
 Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-
-Command (m for help): Created a new <removed>.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 744082c87d..65420b6b92 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -6,11 +6,6 @@ Be careful before using the write command.
 
 Device does not contain a recognized partition table.
 Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-
-Command (m for help): Created a new <removed>.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index 67ed003c65..b6e695f985 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -36,7 +36,6 @@ DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
-o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index 8516149486..e6a4af76be 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -36,7 +36,6 @@ DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
-o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index fe537507fc..94a4c1fc8d 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -35,7 +35,6 @@ DEVICE=$TS_LODEV
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
-o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 21843b0866..48044684b0 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -36,7 +36,6 @@ DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
-o
 n
 p
 1