dcavalca / rpms / util-linux

Forked from rpms/util-linux 2 years ago
Clone
5f5089
From 609177ec200592dce34bf0ee082c0d2ac8d01b8b Mon Sep 17 00:00:00 2001
5f5089
From: Karel Zak <kzak@redhat.com>
5f5089
Date: Tue, 17 Oct 2017 12:35:31 +0200
5f5089
Subject: [PATCH 141/141] tests: check for mdadm
5f5089
5f5089
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1454652
5f5089
Signed-off-by: Karel Zak <kzak@redhat.com>
5f5089
---
5f5089
 tests/ts/blkid/md-raid1-part   | 1 +
5f5089
 tests/ts/eject/umount          | 2 +-
5f5089
 tests/ts/fdisk/align-512-4K-md | 1 +
5f5089
 3 files changed, 3 insertions(+), 1 deletion(-)
5f5089
5f5089
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
5f5089
index 20612ec21..de21bca9a 100755
5f5089
--- a/tests/ts/blkid/md-raid1-part
5f5089
+++ b/tests/ts/blkid/md-raid1-part
5f5089
@@ -22,6 +22,7 @@ TS_DESC="MD raid1 (last partition)"
5f5089
 . $TS_TOPDIR/functions.sh
5f5089
 ts_init "$*"
5f5089
 ts_skip_nonroot
5f5089
+ts_check_prog "mdadm"
5f5089
 
5f5089
 # set global variable TS_DEVICE
5f5089
 ts_scsi_debug_init dev_size_mb=51 sector_size=512
5f5089
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
5f5089
index 994ddb483..e5cfe2b14 100755
5f5089
--- a/tests/ts/eject/umount
5f5089
+++ b/tests/ts/eject/umount
5f5089
@@ -43,7 +43,7 @@ EOF
5f5089
 
5f5089
 function deinit_device {
5f5089
 	udevadm settle
5f5089
-	rmmod scsi_debug
5f5089
+	ts_scsi_debug_rmmod
5f5089
 }
5f5089
 
5f5089
 
5f5089
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
5f5089
index ad662e0e8..c45a0d43b 100755
5f5089
--- a/tests/ts/fdisk/align-512-4K-md
5f5089
+++ b/tests/ts/fdisk/align-512-4K-md
5f5089
@@ -26,6 +26,7 @@ TS_DESC="align 512/4K +MD"
5f5089
 . $TS_TOPDIR/functions.sh
5f5089
 ts_init "$*"
5f5089
 ts_skip_nonroot
5f5089
+ts_check_prog "mdadm"
5f5089
 
5f5089
 # set global variable TS_DEVICE
5f5089
 ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
5f5089
-- 
5f5089
2.13.6
5f5089