From: Anatoly Pugachev <matorola@gmail.com>
Date: Mon, 23 Mar 2020 14:23:01 +0000 (+0300)
Subject: tests: fixes fdisk/align-512-* tests
X-Git-Tag: v2.36-rc1~172^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25f5c514b95e1bf55d5f4bb1717fe2ec7e09d63b;p=thirdparty%2Futil-linux.git

tests: fixes fdisk/align-512-* tests

write 'MSDOS' partition table before test

Signed-off-by: Anatoly Pugachev <matorola@gmail.com>
---

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index e6aa145c9d..26ba8ecfb0 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -6,6 +6,11 @@ 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 831e7dc989..50b9125b9f 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -6,6 +6,11 @@ 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 083641f471..d14e2e9271 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -6,6 +6,11 @@ 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 65420b6b92..744082c87d 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -6,6 +6,11 @@ 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 b6e695f985..67ed003c65 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -36,6 +36,7 @@ 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 e6a4af76be..8516149486 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -36,6 +36,7 @@ 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 94a4c1fc8d..fe537507fc 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -35,6 +35,7 @@ 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 48044684b0..21843b0866 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -36,6 +36,7 @@ DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
 $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1