From: Karel Zak <kzak@redhat.com>
Date: Thu, 11 Feb 2021 11:44:44 +0000 (+0100)
Subject: tests: don't reply on scsi_debug partitions
X-Git-Tag: v2.37-rc1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a37d00e5e59f0f628d0a6b6cd2f9636702fd7c;p=thirdparty%2Futil-linux.git

tests: don't reply on scsi_debug partitions

The disk layout as created by scsi_debug depends on kernel version.
Let's make the partition sizes hardcoded in our tests than rely on
kernel.

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

diff --git a/tests/expected/partx/partx-detect-parts b/tests/expected/partx/partx-detect-parts
index 33d42a58c7..0adc855771 100644
--- a/tests/expected/partx/partx-detect-parts
+++ b/tests/expected/partx/partx-detect-parts
@@ -1,5 +1,5 @@
 NR START    END SECTORS  SIZE NAME UUID
- 1    32  33791   33760 16.5M      
- 2 33792  67583   33792 16.5M      
- 3 67584 102399   34816   17M      
+ 1    32  33791   33760 16.5M      1ddc8a79-01
+ 2 33792  67583   33792 16.5M      1ddc8a79-02
+ 3 67584 102399   34816   17M      1ddc8a79-03
 OK
diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index 67f35f5469..3925d1b3f3 100755
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -26,6 +26,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_PARTX"
 ts_check_test_command "$TS_CMD_ADDPART"
 ts_check_test_command "$TS_CMD_DELPART"
+ts_check_test_command "$TS_CMD_SFDISK"
 
 ts_skip_nonroot
 
@@ -70,10 +71,17 @@ ts_init_subtest "delpart"
 } >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
-ts_scsi_debug_rmmod
 
-# set global variable TS_DEVICE
-ts_scsi_debug_init dev_size_mb=50 num_parts=$PARTS
+udevadm settle
+$TS_CMD_SFDISK $TS_DEVICE &> /dev/null <<EOF
+label: dos
+label-id: 0x1ddc8a79
+32,33760,,
+33792,33792,,
+67584,34816,,
+EOF
+udevadm settle
+
 
 ts_init_subtest "detect-parts"
 {