Author: fehr Date: Tue Apr 10 17:49:06 2012 New Revision: 67902 URL: http://svn.opensuse.org/viewcvs/yast?rev=67902&view=rev Log: undo change to testsuite Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out 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=67902&r1=67901&r2=67902&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 10 17:49:06 2012 @@ -2,7 +2,6 @@ Tue Apr 10 17:36:36 CEST 2012 - fehr@suse.de - Changed license to GPL 2.0 -- fix testsuite ------------------------------------------------------------------- Thu Mar 29 15:15:41 CEST 2012 - jsuchome@suse.cz Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out?rev=67902&r1=67901&r2=67902&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out Tue Apr 10 17:49:06 2012 @@ -1,15 +1,15 @@ Read .target.tmpdir "/tmp" -Read .init.scripts.exists "iscsid" true -Read .init.scripts.runlevel "iscsid" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] +Read .target.stat "/etc/init.d/iscsid" $["isreg":true] +Execute .target.bash "/sbin/chkconfig -l iscsid | /usr/bin/grep -q '[0-6]:on'" 0 Return true -Read .init.scripts.exists "boot.iscsid-early" true -Read .init.scripts.exists "boot.iscsid-early" true -Read .init.scripts.exists "boot.iscsid-early" true +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] +Read .target.stat "/etc/init.d/boot.iscsid-early" $["isreg":true] Read .init.scripts.runlevel "boot.iscsid-early" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.comment "boot.iscsid-early" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] -Read .init.scripts.exists "iscsid" true -Read .init.scripts.exists "iscsid" true -Read .init.scripts.exists "iscsid" true +Read .target.stat "/etc/init.d/iscsid" $["isreg":true] +Read .target.stat "/etc/init.d/iscsid" $["isreg":true] +Read .target.stat "/etc/init.d/iscsid" $["isreg":true] Read .init.scripts.runlevel "iscsid" $["boot.iscsid-early":$["start":["B"], "stop":[]], "iscsid":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.comment "iscsid" $["boot.iscsid-early":$["defstart":["B"], "defstop":[], "description":"", "provides":["iscsiboot"], "reqstart":["boot.proc"], "reqstop":[], "shortdescription":"Starts the iSCSI initiator daemon", "shouldstart":[], "shouldstop":[]], "iscsid":$["defstart":["3", "5"], "defstop":[], "description":"", "provides":["iscsi"], "reqstart":["$network"], "reqstop":[], "shortdescription":"Starts and stops the iSCSI client initiator", "shouldstart":[], "shouldstop":[]]] Return nil -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org