rpms/device-mapper-multipath
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix some tests to be more robust

Browse Source
This commit is contained in:
Benjamin Marzinski 2018-02-20 23:55:07 -06:00
parent b6bec45d60
commit c50e7dffa1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/bindings/main.sh
View File

@ -26,6 +26,7 @@ trun "service multipathd stop"
rpm -q device-mapper-multipath || yum install -y device-mapper-multipath rpm -q device-mapper-multipath || yum install -y device-mapper-multipath
trun "mpathconf --enable --with_multipathd y --user_friendly_names y" trun "mpathconf --enable --with_multipathd y --user_friendly_names y"
trun "service multipathd status" trun "service multipathd status"
sleep 5
trun "multipath -F" trun "multipath -F"
sleep 5 sleep 5
@ -44,6 +45,7 @@ trun "multipath -r"
sleep 5 sleep 5
tok "[[ -b /dev/mapper/$new_alias ]]" tok "[[ -b /dev/mapper/$new_alias ]]"
tok is_mpath $new_alias tok is_mpath $new_alias
sleep 5
trun "multipath -F" trun "multipath -F"
sleep 5 sleep 5
@ -51,4 +53,5 @@ trun "modprobe -r scsi_debug"
trun "service multipathd stop" trun "service multipathd stop"
sleep 3 sleep 3
trun "multipath -W" trun "multipath -W"
trun "rm /etc/multipath/bindings"
tend tend

2
tests/include/ec.sh
View File

@ -159,6 +159,7 @@ AA
sleep 5s #multipathd return premature sleep 5s #multipathd return premature
multipath -r multipath -r
multipathd -k'reconfigure' multipathd -k'reconfigure'
sleep 5s
mpath_name_list=$(dmsetup table \ mpath_name_list=$(dmsetup table \
| perl -ne 'print "$1 " if /(mpath[a-z0-9]+):[0-9 ]+multipath.*/') | perl -ne 'print "$1 " if /(mpath[a-z0-9]+):[0-9 ]+multipath.*/')
fi fi
@ -217,6 +218,7 @@ AA
service multipathd restart service multipathd restart
sleep 5s #multipathd return premature sleep 5s #multipathd return premature
multipathd -k'reconfig' multipathd -k'reconfig'
sleep 5s
mpath_name_list=$(dmsetup table | perl -ne 'print "$1 " if /(mpath[a-z0-9]+):[0-9 ]+multipath.*/') mpath_name_list=$(dmsetup table | perl -ne 'print "$1 " if /(mpath[a-z0-9]+):[0-9 ]+multipath.*/')
if [ "CHK${mpath_name_list}" != "CHK" ];then if [ "CHK${mpath_name_list}" != "CHK" ];then