From: Karel Zak <kzak@redhat.com>
Date: Thu, 5 Sep 2019 14:46:14 +0000 (+0200)
Subject: tests: update sfdisk wipe output
X-Git-Tag: v2.35-rc1~234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91099dea357e06074a38f81758c055b5806c1b05;p=thirdparty%2Futil-linux.git

tests: update sfdisk wipe output

- stderr is used for the warning (like in fdisk)

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

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 7032929134..deeb1dfe75 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1476,7 +1476,7 @@ static void follow_wipe_mode(struct sfdisk *sf)
 
 	if (dowipe) {
 		if (!fdisk_is_ptcollision(sf->cxt)) {
-			fdisk_warn(sf->cxt, _(
+			fdisk_warnx(sf->cxt, _(
 				"The device contains '%s' signature and it will be removed by a write command. "
 				"See sfdisk(8) man page and --wipe option for more details."),
 				fdisk_get_collision(sf->cxt));
diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos
index b9fab7a32a..317bbfb450 100644
--- a/tests/expected/sfdisk/wipe-fs-to-dos
+++ b/tests/expected/sfdisk/wipe-fs-to-dos
@@ -2,7 +2,6 @@
 =====Create FS================================
 
 =====Create DOS================================
-The old swap signature will be removed by a write command.
 
 Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
@@ -11,7 +10,6 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Created a new <removed>.
-The old swap signature will be removed by a write command.
 
 <removed>1: Created a new <removed>.
 <removed>2: Done.
diff --git a/tests/expected/sfdisk/wipe-fs-to-dos.err b/tests/expected/sfdisk/wipe-fs-to-dos.err
index e69de29bb2..d0b1745304 100644
--- a/tests/expected/sfdisk/wipe-fs-to-dos.err
+++ b/tests/expected/sfdisk/wipe-fs-to-dos.err
@@ -0,0 +1,2 @@
+The device contains 'swap' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details.
+The device contains 'swap' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details.