From: Harald Hoyer <harald@redhat.com>
Date: Sat, 15 Aug 2015 11:22:44 +0000 (+0200)
Subject: TEST-30-ISCSI: fix test to run with new iscsi
X-Git-Tag: 044~75
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0a10d7fc51e181f6e9c4715f563be3861c054a56;p=thirdparty%2Fdracut.git

TEST-30-ISCSI: fix test to run with new iscsi

(cherry picked from commit 836ca3f47eb0b0a4c97ae704b0b9619a00dbfa87)
---

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index ffdb77f20..fc4bdce9e 100755
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -49,7 +49,7 @@ run_client() {
         -net nic,macaddr=52:54:00:12:34:00,model=e1000 \
         -net nic,macaddr=52:54:00:12:34:01,model=e1000 \
         -net socket,connect=127.0.0.1:12330 \
-        -append "rw rd.auto rd.retry=20 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
+        -append "rw rd.auto rd.retry=50 console=ttyS0,115200n81 selinux=0 rd.debug=0 $DEBUGFAIL $*" \
         -initrd $TESTDIR/initramfs.testing
     if ! grep -F -m 1 -q iscsi-OK $TESTDIR/client.img; then
 	echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]"
@@ -93,7 +93,7 @@ do_test_run() {
                "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
                "rd.iscsi.firmware" \
                "rd.iscsi.initiator=$initiator" \
-               "rd.waitnet=0 rd.retry=30" \
+               "rd.iscsi.waitnet=0" \
 	|| return 1
 
     run_client "netroot=iscsi target1 target2 rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
@@ -104,7 +104,7 @@ do_test_run() {
                "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
                "rd.iscsi.firmware" \
                "rd.iscsi.initiator=$initiator" \
-               "rd.waitnet=0 rd.iscsi.testroute=0 rd.retry=30" \
+               "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" \
@@ -115,7 +115,7 @@ do_test_run() {
                "netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target2" \
                "rd.iscsi.firmware" \
                "rd.iscsi.initiator=$initiator" \
-               "rd.waitnet=0 rd.iscsi.testroute=0 rd.retry=30" \
+               "rd.iscsi.waitnet=0 rd.iscsi.testroute=0" \
 	|| return 1
 
     return 0