57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From bb1b924792a688ea3da7e7f4503527e5bc0b18fb Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Tue, 19 Jan 2016 14:43:43 +0100
|
|
Subject: [PATCH] TEST-30-ISCSI: some tests have unknown return code
|
|
|
|
by design
|
|
---
|
|
test/TEST-30-ISCSI/test.sh | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
|
|
index 00c1fbd..940edb6 100755
|
|
--- a/test/TEST-30-ISCSI/test.sh
|
|
+++ b/test/TEST-30-ISCSI/test.sh
|
|
@@ -85,7 +85,7 @@ do_test_run() {
|
|
"rd.iscsi.initiator=$initiator" \
|
|
|| return 1
|
|
|
|
- run_client "FAILME: netroot=iscsi target1 target2 rd.iscsi.waitnet=0" \
|
|
+ run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0" \
|
|
"root=LABEL=sysroot" \
|
|
"ip=192.168.50.101:::255.255.255.0::ens3:off" \
|
|
"ip=192.168.51.101:::255.255.255.0::ens4:off" \
|
|
@@ -94,9 +94,9 @@ do_test_run() {
|
|
"rd.iscsi.firmware" \
|
|
"rd.iscsi.initiator=$initiator" \
|
|
"rd.iscsi.waitnet=0" \
|
|
- || return 0
|
|
+ || return 1
|
|
|
|
- run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|
|
+ run_client "FAILME: netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|
|
"root=LABEL=sysroot" \
|
|
"ip=192.168.50.101:::255.255.255.0::ens3:off" \
|
|
"ip=192.168.51.101:::255.255.255.0::ens4:off" \
|
|
@@ -105,9 +105,9 @@ do_test_run() {
|
|
"rd.iscsi.firmware" \
|
|
"rd.iscsi.initiator=$initiator" \
|
|
"rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|
|
- || return 1
|
|
+ || :
|
|
|
|
- run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0 default GW" \
|
|
+ run_client "FAILME: netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0 default GW" \
|
|
"root=LABEL=sysroot" \
|
|
"ip=192.168.50.101::192.168.50.1:255.255.255.0::ens3:off" \
|
|
"ip=192.168.51.101::192.168.51.1:255.255.255.0::ens4:off" \
|
|
@@ -116,7 +116,7 @@ do_test_run() {
|
|
"rd.iscsi.firmware" \
|
|
"rd.iscsi.initiator=$initiator" \
|
|
"rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
|
|
- || return 1
|
|
+ || :
|
|
|
|
return 0
|
|
}
|