From: Karel Zak <kzak@redhat.com>
Date: Mon, 11 Mar 2013 14:14:51 +0000 (+0100)
Subject: tests: ignore stderr in fdisk -l
X-Git-Tag: v2.23-rc1~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32011e8925a97a56887217141fba1f6e22f1c458;p=thirdparty%2Futil-linux.git

tests: ignore stderr in fdisk -l

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

diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt
index 2206392e66..b73d5c339f 100644
--- a/tests/expected/fdisk/gpt
+++ b/tests/expected/fdisk/gpt
@@ -2,9 +2,6 @@ Initialize empty image
 Create new GPT partition table
 
 ---layout----------
-WARNING: fdisk GPT support is currently new, and therefore in an experimental phase. Use at your own discretion.
-
-
 __ts_dev__: 10 MB, 10485760 bytes, 20480 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
@@ -19,9 +16,6 @@ Create partitions
 Change partition type by number
 
 ---layout----------
-WARNING: fdisk GPT support is currently new, and therefore in an experimental phase. Use at your own discretion.
-
-
 __ts_dev__: 10 MB, 10485760 bytes, 20480 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
@@ -43,9 +37,6 @@ Disk label type: gpt
 Change partition type by UUID
 
 ---layout----------
-WARNING: fdisk GPT support is currently new, and therefore in an experimental phase. Use at your own discretion.
-
-
 __ts_dev__: 10 MB, 10485760 bytes, 20480 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
@@ -67,9 +58,6 @@ Disk label type: gpt
 Delete partition
 
 ---layout----------
-WARNING: fdisk GPT support is currently new, and therefore in an experimental phase. Use at your own discretion.
-
-
 __ts_dev__: 10 MB, 10485760 bytes, 20480 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
@@ -90,9 +78,6 @@ Disk label type: gpt
 Create again partition
 
 ---layout----------
-WARNING: fdisk GPT support is currently new, and therefore in an experimental phase. Use at your own discretion.
-
-
 __ts_dev__: 10 MB, 10485760 bytes, 20480 sectors
 Units = sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index 179e9387f5..a0902ca9f4 100755
--- a/tests/ts/fdisk/gpt
+++ b/tests/ts/fdisk/gpt
@@ -36,7 +36,7 @@ FDISK_CMD_CREATE_PART="n\n2\n\n\n"           # create 2nd partition
 
 function print_layout {
 	echo -ne "\n---layout----------" >> $TS_OUTPUT
-	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | \
+	$TS_CMD_FDISK -l ${TEST_IMAGE_NAME} 2> /dev/null | \
 		sed 's/^.*\.img/__ts_dev__/g;
 		     s/^[[:blank:]]*Device Boot/     Device Boot/g' >> $TS_OUTPUT 2>&1
 	echo -ne   "-------------------\n\n" >> $TS_OUTPUT