From: Karel Zak <kzak@redhat.com>
Date: Fri, 17 Feb 2017 15:24:35 +0000 (+0100)
Subject: tests: make sfdisk wipe partition optional
X-Git-Tag: v2.30-rc1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f519a90c15803fe262a569265bc0876b8726d4d;p=thirdparty%2Futil-linux.git

tests: make sfdisk wipe partition optional

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

diff --git a/tests/ts/sfdisk/wipe b/tests/ts/sfdisk/wipe
index feb22b14ff..d5f12b772c 100755
--- a/tests/ts/sfdisk/wipe
+++ b/tests/ts/sfdisk/wipe
@@ -94,10 +94,19 @@ udevadm settle
 ts_separator "Check content (disk)"
 $TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
 udevadm settle
-ts_separator "Check content (partition)"
-$TS_CMD_WIPEFS ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
-ts_fdisk_clean $TS_DEVICE
-ts_finalize_subtest
+
+# this sometimes do not pass on Travis CI... just skip
+#
+DEVNAME=$(basename $TS_DEVICE)
+grep -q "${DEVNAME}1" /proc/partitions
+if [ $? -ne 0 ]; then
+	ts_skip_subtest "no ${TS_DEVICE}1 partition!"
+else
+	ts_separator "Check content (partition)"
+	$TS_CMD_WIPEFS ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
+	ts_fdisk_clean $TS_DEVICE
+	ts_finalize_subtest
+fi
 
 udevadm settle
 ts_finalize