Author: lslezak Date: Fri Sep 9 11:04:32 2011 New Revision: 65627 URL: http://svn.opensuse.org/viewcvs/yast?rev=65627&view=rev Log: updated testsuite Modified: branches/tmp/lslezak/runlevel/testsuite/tests/getScripts.ycp branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.out branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.ycp Modified: branches/tmp/lslezak/runlevel/testsuite/tests/getScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/runlevel/testsuite/tests/getScripts.ycp?rev=65627&r1=65626&r2=65627&view=diff ============================================================================== --- branches/tmp/lslezak/runlevel/testsuite/tests/getScripts.ycp (original) +++ branches/tmp/lslezak/runlevel/testsuite/tests/getScripts.ycp Fri Sep 9 11:04:32 2011 @@ -51,10 +51,14 @@ "default_runlevel" : "5", ] ], - "target" : $[ - "size" : -1, - ], + "target" : $[ + "stat" : $[ "isreg" : true ], + "size" : 0, + "string" : "" + ] ]; + + TESTSUITE_INIT ([READ, $[], $[]], nil); import "RunlevelEd"; @@ -98,7 +102,12 @@ "current_runlevel" : "5", "default_runlevel" : "5", ] - ] + ], + "target" : $[ + "stat" : $[ "isreg" : true ], + "size" : 0, + "string" : "" + ] ]; TEST (``(RunlevelEd::Read ()), [READ] , 0); Modified: branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.out?rev=65627&r1=65626&r2=65627&view=diff ============================================================================== --- branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.out (original) +++ branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.out Fri Sep 9 11:04:32 2011 @@ -3,39 +3,30 @@ Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 -Read .init.scripts.exists "a" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.exists "b" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f a" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f a 123" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f b" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f b 123" $["exit":0, "stderr":"", "stdout":""] Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 -Read .init.scripts.exists "a" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.exists "b" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f a" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f a 123" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f b" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f b 123" $["exit":0, "stderr":"", "stdout":""] Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 -Read .init.scripts.exists "a" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/a,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.exists "b" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/b,start=1,2,3" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f a" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f a 123" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f b" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f b 123" $["exit":0, "stderr":"", "stdout":""] Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 -Read .init.scripts.exists "a" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/a" $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.exists "b" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/b" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f a" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f b" $["exit":0, "stderr":"", "stdout":""] Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 Return true Execute .target.bash "sed --in-place 's/^\\(l4:4:wait:\\/etc\\/init.d\\/rc 4\\)/#\\1/' /etc/inittab" 0 -Read .init.scripts.exists "nfsserver" true -Execute .target.bash_output "/sbin/insserv -rf /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""] -Execute .target.bash_output "/sbin/insserv -f /etc/init.d/nfsserver,start=1" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -d -f nfsserver" $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/chkconfig -s -f nfsserver 1" $["exit":0, "stderr":"", "stdout":""] Return true Modified: branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.ycp?rev=65627&r1=65626&r2=65627&view=diff ============================================================================== --- branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.ycp (original) +++ branches/tmp/lslezak/runlevel/testsuite/tests/saveServices.ycp Fri Sep 9 11:04:32 2011 @@ -17,6 +17,10 @@ "target" : $[ "size" : -1, ], + "target" : $[ + "stat" : $[ "isreg" : true ], + "size" : 0, + ] ]; TESTSUITE_INIT ([READ, $[], $[]], nil); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org