diff options
| author | Harald Hoyer <harald@redhat.com> | 2009-10-06 18:11:02 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2009-10-06 19:09:17 +0200 |
| commit | f12b432efdda8b714add50b40e9f8518bbae7dd7 (patch) | |
| tree | e16917589f1fab0daad98f876bd94749bc4872ca | |
| parent | e71a5ca5f2c2421012e562b7371bc8bd8a227859 (diff) | |
test: add "failme" parameter for failing tests
| -rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 12 | ||||
| -rwxr-xr-x | test/TEST-14-IMSM/test.sh | 4 | ||||
| -rwxr-xr-x | test/TEST-20-NFS/test.sh | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 4359253..4d88d79 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -30,21 +30,21 @@ test_run() { client_run rd_NO_MDADMCONF || return 1 - client_run rd_NO_LVM && return 1 + client_run rd_NO_LVM failme && return 1 - client_run rd_LVM_VG=failme && return 1 + client_run rd_LVM_VG=failme failme && return 1 client_run rd_LVM_VG=dracut || return 1 - client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 || return 1 + client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 rd_NO_LVMCONF || return 1 - client_run rd_MD_UUID=failme rd_NO_MDADMCONF && return 1 + client_run rd_MD_UUID=failme rd_NO_MDADMCONF failme && return 1 - client_run rd_NO_MD && return 1 + client_run rd_NO_MD failme && return 1 client_run rd_MD_UUID=$MD_UUID rd_NO_MDADMCONF || return 1 - client_run rd_MD_UUID=dummy1 rd_MD_UUID=$MD_UUID rd_MD_UUID=dummy2 rd_NO_MDADMCONF|| return 1 + client_run rd_MD_UUID=dummy1 rd_MD_UUID=$MD_UUID rd_MD_UUID=dummy2 rd_NO_MDADMCONF || return 1 return 0 } diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index be33ac3..d86afc2 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -29,8 +29,8 @@ test_run() { # 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 && return 1 - client_run rd_NO_MD && return 1 + client_run rd_NO_MD rd_NO_MDIMSM failme && return 1 + client_run rd_NO_MD failme && return 1 return 0 } diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 8072cf0..e246ed0 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -133,7 +133,7 @@ test_nfsv3() { # This test must fail: nfsroot= requires root=/dev/nfs client_test "NFSv3 Invalid root=dhcp nfsroot=/nfs/client" 52:54:00:12:34:04 \ - "root=dhcp nfsroot=/nfs/client" 192.168.50.1 -wsize=4096 && return 1 + "root=dhcp nfsroot=/nfs/client failme" 192.168.50.1 -wsize=4096 && return 1 client_test "NFSv3 root=dhcp DHCP path,options" \ 52:54:00:12:34:05 "root=dhcp" 192.168.50.1 wsize=4096 || return 1 |