Author: lslezak Date: Thu Sep 8 15:16:24 2011 New Revision: 65610 URL: http://svn.opensuse.org/viewcvs/yast?rev=65610&view=rev Log: updated Service::Adjust() test Modified: branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.out branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.ycp Modified: branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.out?rev=65610&r1=65609&r2=65610&view=diff ============================================================================== --- branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.out (original) +++ branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.out Thu Sep 8 15:16:24 2011 @@ -1,37 +1,39 @@ -Read .init.scripts.exists "aaa" false +Read .target.tmpdir "/tmp" +Read .target.stat "/etc/init.d/aaa" $[] +Read .target.stat "/lib/systemd/system/aaa.service" $[] Log Service aaa does not exist. Return false -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"], "stop":["4", "5", "6"]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/sbin/insserv -r /etc/init.d/aaa" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d aaa" $["exit":0, "stderr":"", "stdout":""] Return true -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":[], "stop":[]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] Return true -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":[], "stop":[]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/aaa" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -a aaa" $["exit":0, "stderr":"", "stdout":""] Return true -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":["1"], "stop":[]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] Return true -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":["1"], "stop":[]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/aaa" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -a aaa" $["exit":0, "stderr":"", "stdout":""] Return true -Read .init.scripts.exists "aaa" true -Read .init.scripts.exists "aaa" true +Read .target.stat "/etc/init.d/aaa" $["isreg":true] +Read .target.stat "/etc/init.d/aaa" $["isreg":true] Read .init.scripts.runlevel "aaa" $["aaa":$["start":["0", "1", "3"], "stop":[]]] Read .init.scripts.comment "aaa" $["aaa":$["defstart":["0", "1", "3"], "defstop":["4", "5", "6"]]] -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/aaa" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -a aaa" $["exit":0, "stderr":"", "stdout":""] Return true Modified: branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.ycp?rev=65610&r1=65609&r2=65610&view=diff ============================================================================== --- branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.ycp (original) +++ branches/tmp/lslezak/yast2/library/runlevel/testsuite/tests/ServiceAdjust.ycp Thu Sep 8 15:16:24 2011 @@ -1,5 +1,8 @@ { include "testsuite.ycp"; + + TESTSUITE_INIT ([$[ "target" : $[ "tmpdir": "/tmp" ] ], $[], $[]], nil); + import "Service"; map READ = $[]; @@ -25,7 +28,11 @@ ] ], "exists" : false, - ] ] ]; + ] ], + "target" : $[ + "stat" : $[] + ] + ]; TEST (``(Service::Adjust ("aaa", "disable")), [ READ, $[], EXEC ], nil); // service exists and may run @@ -43,7 +50,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "disable")), [ READ, $[], EXEC ], nil); // service exists and does not run @@ -61,7 +72,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "disable")), [ READ, $[], EXEC ], nil); // service exists and does not run @@ -79,7 +94,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "enable")), [ READ, $[], EXEC ], nil); READ = $[ "init" : $[ "scripts" : $[ @@ -96,7 +115,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "enable")), [ READ, $[], EXEC ], nil); READ = $[ "init" : $[ "scripts" : $[ @@ -113,7 +136,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "default")), [ READ, $[], EXEC ], nil); READ = $[ "init" : $[ "scripts" : $[ @@ -130,7 +157,11 @@ ] ], "exists" : true, - ] ] ]; + ] ], + "target" : $[ + "stat" : $["isreg": true] + ] + ]; TEST (``(Service::Adjust ("aaa", "default")), [ READ, $[], EXEC ], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org