summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Brassow <jbrassow@redhat.com>2017-11-02 10:25:46 -0500
committerJonathan Brassow <jbrassow@redhat.com>2017-11-02 10:25:46 -0500
commit4129cf5090cd329dceee03df127d6d3644bbaa66 (patch)
tree565d49c097a09fcb34c30f629bb543cf9fe6653a
parent9e8dec2f387d8eaf48195ef38ab7699d4a8385ed (diff)
downloadlvm2-4129cf5090cd329dceee03df127d6d3644bbaa66.tar.gz
testsuite: Forgot to pull 'should's after fixing RAID4/5/6 mismatch test
Test will now fail rather than warn if conditions are not met.
-rw-r--r--test/shell/lvchange-raid.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh
index 604b7f7d6..e6626d187 100644
--- a/test/shell/lvchange-raid.sh
+++ b/test/shell/lvchange-raid.sh
@@ -184,15 +184,8 @@ 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
- fi
- # 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"
+ check lv_attr_bit health $vg/$lv "m"
+ not check lv_field $vg/$lv raid_mismatch_count "0"
# "repair" will fix discrepancies
lvchange --syncaction repair $vg/$lv
@@ -202,7 +195,7 @@ run_syncaction_check() {
# 'lvs' should show results
lvchange --syncaction check $vg/$lv
aux wait_for_sync $vg $lv
- check lv_attr_bit health $vg/$lv "-" || check lv_attr_bit health $vg/$lv "m"
+ check lv_attr_bit health $vg/$lv "-"
check lv_field $vg/$lv raid_mismatch_count "0"
}