Author: locilka Date: Thu May 22 18:44:54 2008 New Revision: 47817 URL: http://svn.opensuse.org/viewcvs/yast?rev=47817&view=rev Log: Fixed testsuite Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/iscsi-client_finish.ycp trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=47817&r1=47816&r2=47817&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu May 22 18:44:54 2008 @@ -3,6 +3,7 @@ - Not only open-iscsi, but also boot.open-iscsi service should be enabled (bnc #393057). +- Fixed testsuite. - 2.16.14 ------------------------------------------------------------------- Modified: trunk/iscsi-client/src/iscsi-client_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/iscsi-client_finish.ycp?rev=47817&r1=47816&r2=47817&view=diff ============================================================================== --- trunk/iscsi-client/src/iscsi-client_finish.ycp (original) +++ trunk/iscsi-client/src/iscsi-client_finish.ycp Thu May 22 18:44:54 2008 @@ -48,6 +48,8 @@ { // write open-iscsi database of automatic connected targets WFM::Execute (.local.bash,"test -d /etc/iscsi/ && mkdir -p '" + String::Quote(Installation::destdir) + "/etc/iscsi' && cp -a /etc/iscsi/* '" + String::Quote(Installation::destdir) + "/etc/iscsi/'"); + // copy also iscsid configuration + WFM::Execute (.local.bash,"test -e /etc/iscsid.conf && cp -a /etc/iscsid.conf '" + String::Quote(Installation::destdir) + "/etc/iscsid.conf'"); if ( size(IscsiClientLib::sessions)>0 ){ Service::Enable("boot.open-iscsi"); Service::Enable("open-iscsi"); Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out?rev=47817&r1=47816&r2=47817&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out Thu May 22 18:44:54 2008 @@ -1,10 +1,15 @@ Read .target.tmpdir "/tmp" Read .init.scripts.exists "open-iscsi" true -Read .init.scripts.runlevel "open-iscsi" $["open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] Return true +Read .init.scripts.exists "boot.open-iscsi" true +Read .init.scripts.exists "boot.open-iscsi" true +Read .init.scripts.exists "boot.open-iscsi" true +Read .init.scripts.runlevel "boot.open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "boot.open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] Read .init.scripts.exists "open-iscsi" true Read .init.scripts.exists "open-iscsi" true Read .init.scripts.exists "open-iscsi" true -Read .init.scripts.runlevel "open-iscsi" $["open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "open-iscsi" $["open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] +Read .init.scripts.runlevel "open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "open-iscsi" $["boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] Return nil Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp?rev=47817&r1=47816&r2=47817&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Thu May 22 18:44:54 2008 @@ -8,8 +8,8 @@ "init" :$[ "scripts" :$[ "exists" : true, - "runlevel" : $[ "open-iscsi":$["start":["3","5"], "stop":["3", "5"]] ], - "comment" : $["open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] + "runlevel" : $[ "open-iscsi":$["start":["3","5"], "stop":["3", "5"]], "boot.open-iscsi":$["start":["B"], "stop":[]] ], + "comment" : $["open-iscsi":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]], "boot.open-iscsi":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]]], ] ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org