TEST-14-IMSM: fixed test

master
Harald Hoyer 2010-08-02 11:58:48 +02:00
parent aceaf13b44
commit cc97412c32
2 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,7 @@
#!/bin/sh
# don't let udev and this script step on eachother's toes
for x in 61-dmraid-imsm.rules 65-md-incremental-imsm.rules 65-md-incremental.rules 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
> "/etc/udev/rules.d/$x"
for x in 61-dmraid-imsm.rules 64-md-raid.rules 65-md-incremental-imsm.rules 65-md-incremental.rules 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
rm "/etc/udev/rules.d/$x"
done
rm /etc/lvm/lvm.conf


View File

@ -4,7 +4,8 @@ TEST_DESCRIPTION="root filesystem on LVM PV on a isw dmraid"
KVERSION=${KVERSION-$(uname -r)}

# Uncomment this to debug failures
#DEBUGFAIL="rdshell"
DEBUGFAIL="rdshell"
#DEBUGFAIL="$DEBUGFAIL udev.log-priority=debug"

client_run() {
echo "CLIENT TEST START: $@"
@ -28,9 +29,10 @@ test_run() {
client_run rd_NO_DM || return 1
# This test succeeds, because the mirror parts are found without
# assembling the mirror itsself, which is what we want
client_run rd_NO_DM rd_NO_MDIMSM rd_NO_MDADMCONF || return 1
client_run rd_NO_MD rd_NO_MDIMSM failme && return 1
client_run rd_NO_MD failme && return 1
# the following test hangs on newer md
#client_run rd_NO_DM rd_NO_MDIMSM rd_NO_MDADMCONF || return 1
return 0
}