Author: lslezak Date: Mon Sep 12 15:41:38 2011 New Revision: 65659 URL: http://svn.opensuse.org/viewcvs/yast?rev=65659&view=rev Log: - updated testsuite (systemd support) (bnc#664548) - 2.21.3 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=65659&r1=65658&r2=65659&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Mon Sep 12 15:41:38 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 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=65659&r1=65658&r2=65659&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon Sep 12 15:41:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 12 13:40:54 UTC 2011 - lslezak@suse.cz + +- updated testsuite (systemd support) (bnc#664548) +- 2.21.3 + +------------------------------------------------------------------- Fri Aug 5 12:32:45 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out?rev=65659&r1=65658&r2=65659&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.out Mon Sep 12 15:41:38 2011 @@ -1,15 +1,15 @@ Read .target.tmpdir "/tmp" -Read .init.scripts.exists "open-iscsi" true -Read .init.scripts.runlevel "open-iscsi" $["boot.open-iscsi":$["start":["B"], "stop":[]], "open-iscsi":$["start":["3", "5"], "stop":["3", "5"]]] +Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true] +Execute .target.bash "/sbin/chkconfig -l open-iscsi | /usr/bin/grep -q '[0-6]:on'" 0 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 .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true] +Read .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":true] +Read .target.stat "/etc/init.d/boot.open-iscsi" $["isreg":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 .target.stat "/etc/init.d/open-iscsi" $["isreg":true] +Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true] +Read .target.stat "/etc/init.d/open-iscsi" $["isreg":true] 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=65659&r1=65658&r2=65659&view=diff ============================================================================== --- trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp (original) +++ trunk/iscsi-client/testsuite/tests/GetSetServiceStatus.ycp Mon Sep 12 15:41:38 2011 @@ -3,7 +3,8 @@ map READ = $[ "target" : $[ - "tmpdir" : "/tmp" + "tmpdir" : "/tmp", + "stat" : $["isreg" : true] ], "init" :$[ "scripts" :$[ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org