Author: lslezak Date: Mon Sep 12 14:35:27 2011 New Revision: 65655 URL: http://svn.opensuse.org/viewcvs/yast?rev=65655&view=rev Log: - updated testsuite (systemd support) (bnc#664548) - 2.21.0 Modified: trunk/inetd/VERSION trunk/inetd/package/yast2-inetd.changes trunk/inetd/testsuite/tests/Inetd.out trunk/inetd/testsuite/tests/Inetd2.out trunk/inetd/testsuite/tests/Inetd3.out Modified: trunk/inetd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/VERSION?rev=65655&r1=65654&r2=65655&view=diff ============================================================================== --- trunk/inetd/VERSION (original) +++ trunk/inetd/VERSION Mon Sep 12 14:35:27 2011 @@ -1 +1 @@ -2.19.0 +2.21.0 Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.changes?rev=65655&r1=65654&r2=65655&view=diff ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Mon Sep 12 14:35:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 12 12:33:51 UTC 2011 - lslezak@suse.cz + +- updated testsuite (systemd support) (bnc#664548) +- 2.21.0 + +------------------------------------------------------------------- Fri Aug 5 12:32:13 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/inetd/testsuite/tests/Inetd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/testsuite/tests/Inetd.out?rev=65655&r1=65654&r2=65655&view=diff ============================================================================== --- trunk/inetd/testsuite/tests/Inetd.out (original) +++ trunk/inetd/testsuite/tests/Inetd.out Mon Sep 12 14:35:27 2011 @@ -5,13 +5,12 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write services Write .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] true -Execute .target.bash_output "/etc/init.d/xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/service xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- @@ -23,19 +22,14 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write xinetd Dump inetd and xinetd are installed and only inetd is running Dump Write .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] true -Read .init.scripts.exists "xinetd" true -Execute .target.bash_output "/etc/init.d/xinetd stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.exists "xinetd" true -Read .init.scripts.exists "xinetd" true -Read .init.scripts.exists "xinetd" true +Execute .target.bash_output "/sbin/service xinetd stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.runlevel "xinetd" $["xinetd":$["start":[], "stop":[]]] Read .init.scripts.comment "xinetd" $["xinetd":$[]] Return true Modified: trunk/inetd/testsuite/tests/Inetd2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/testsuite/tests/Inetd2.out?rev=65655&r1=65654&r2=65655&view=diff ============================================================================== --- trunk/inetd/testsuite/tests/Inetd2.out (original) +++ trunk/inetd/testsuite/tests/Inetd2.out Mon Sep 12 14:35:27 2011 @@ -5,15 +5,14 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services nil -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write inetd Dump inetd is installed and stopped Dump Write .etc.xinetd_conf.services nil true -Execute .target.bash_output "/etc/init.d/xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/service xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- @@ -22,13 +21,12 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services nil -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write inetd Write .etc.xinetd_conf.services nil true -Execute .target.bash_output "/etc/init.d/xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/service xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- Modified: trunk/inetd/testsuite/tests/Inetd3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/testsuite/tests/Inetd3.out?rev=65655&r1=65654&r2=65655&view=diff ============================================================================== --- trunk/inetd/testsuite/tests/Inetd3.out (original) +++ trunk/inetd/testsuite/tests/Inetd3.out Mon Sep 12 14:35:27 2011 @@ -2,25 +2,23 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write xinetd Write .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] true -Execute .target.bash_output "/etc/init.d/xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/service xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Read .init.scripts.exists "xinetd" true -Execute .target.bash "/etc/init.d/xinetd status" $["TERM":"raw"] 0 +Execute .target.bash "/sbin/service xinetd status" $["TERM":"raw"] 0 Return true Dump Dump Write --- write xinetd Write .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] true -Execute .target.bash_output "/etc/init.d/xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output "/sbin/service xinetd force-reload" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org