[lvm-devel] master - tests: syncaction needs kernel fix

[Zdenek Kabelac]

Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c3bb9629a8e1cd786fad33def773873008bdc413
Commit:        c3bb9629a8e1cd786fad33def773873008bdc413
Parent:        e1dede6f6b8b2d05e65acfda56ba3ec0d59f7619
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Tue Oct 21 10:52:57 2014 +0200
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Fri Oct 24 16:39:32 2014 +0200

tests: syncaction needs kernel fix

Add 'should' as we currently cannot pass this test.

FIXME:
Add properly wrapper to not use 'should' with fixed kernel.
---
 test/shell/lvchange-raid.sh            |    8 ++++++--
 test/shell/lvchange-syncaction-raid.sh |    4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh
index a0a0d2a..00b5265 100644
--- a/test/shell/lvchange-raid.sh
+++ b/test/shell/lvchange-raid.sh
@@ -167,11 +167,15 @@ run_syncaction_check() {
 	# 'lvs' should show results
 	lvchange --syncaction check $vg/$lv
 	aux wait_for_sync $vg $lv
+        # FIXME: this needs kernel fix in md-raid
+        # currently let just this test to cause 'warning'
 	if ! get lv_field $vg/$lv lv_attr -a | grep '.*m.$'; then
 		dmsetup status | grep $vg
-		false
+		# false
 	fi
-	not check lv_field $vg/$lv raid_mismatch_count "0"
+        # FIXME: with fixed kernel this should not fail
+        # add 'wrapper' detecting kernel for this
+	should not check lv_field $vg/$lv raid_mismatch_count "0"
 
 	# "repair" will fix discrepancies
 	lvchange --syncaction repair $vg/$lv
diff --git a/test/shell/lvchange-syncaction-raid.sh b/test/shell/lvchange-syncaction-raid.sh
index 18af83f..9a42894 100644
--- a/test/shell/lvchange-syncaction-raid.sh
+++ b/test/shell/lvchange-syncaction-raid.sh
@@ -37,7 +37,7 @@ lvchange -an $vg/$lv1
 aux delay_dev "$dev2" 0 100
 lvchange -ay $vg/$lv1
 # noone has it open and target is read & running
-dmsetup info -c
+dmsetup info -c | grep $vg
 
 #sleep 10 < "$DM_DEV_DIR/$vg/$lv1" &
 # "check" should find discrepancies but not change them
@@ -49,7 +49,7 @@ dmsetup info -c
 # For now it fails with:
 # device-mapper: message ioctl on  failed: Device or resource busy
 #
-lvchange --syncaction check $vg/$lv1
+should lvchange --syncaction check $vg/$lv1
 
 aux enable_dev "$dev2"
 lvs -o+raid_mismatch_count -a $vg