Author: lslezak Date: Tue Sep 13 10:02:37 2011 New Revision: 65670 URL: http://svn.opensuse.org/viewcvs/yast?rev=65670&view=rev Log: - updated testsuite (systemd support) (bnc#664548) - 2.21.3 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/testsuite/YaPI/ (props changed) trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.out trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp trunk/samba-server/testsuite/YaPI/tests/tests-common.yh Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Tue Sep 13 10:02:37 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Tue Sep 13 10:02:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 13 08:00:59 UTC 2011 - lslezak@suse.cz + +- updated testsuite (systemd support) (bnc#664548) +- 2.21.3 + +------------------------------------------------------------------- Mon Sep 12 14:22:51 CEST 2011 - jsuchome@suse.cz - corrected service names in testsuites (thanks to lslezak) Modified: trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.out?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.out (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.out Tue Sep 13 10:02:37 2011 @@ -1,36 +1,24 @@ Return Enable disabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" nil -Read .init.scripts.exists "nmb" true -Read .init.scripts.exists "nmb" true +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 1 Read .init.scripts.runlevel "nmb" nil Read .init.scripts.comment "nmb" nil -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nmb" $["exit":0] -Read .init.scripts.exists "smb" true -Read .init.scripts.exists "smb" true +Execute .target.bash_output "/sbin/chkconfig -a nmb" $["exit":0] Read .init.scripts.runlevel "smb" nil Read .init.scripts.comment "smb" nil -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/smb" $["exit":0] +Execute .target.bash_output "/sbin/chkconfig -a smb" $["exit":0] Return true Return Disable disabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" nil +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 1 Return true Return Enable enabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" $["nmb":$["start":["2", "3", "5"]], "smb":$["start":["2", "3", "5"]]] +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 0 Return true Return Disable enabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" $["nmb":$["start":["2", "3", "5"]], "smb":$["start":["2", "3", "5"]]] -Read .init.scripts.exists "nmb" true -Read .init.scripts.exists "nmb" true +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 0 Read .init.scripts.runlevel "nmb" $["nmb":$["start":["2", "3", "5"]], "smb":$["start":["2", "3", "5"]]] Read .init.scripts.comment "nmb" nil -Execute .target.bash_output "/sbin/insserv -r /etc/init.d/nmb" $["exit":0] -Read .init.scripts.exists "smb" true -Read .init.scripts.exists "smb" true +Execute .target.bash_output "/sbin/chkconfig -d nmb" $["exit":0] Read .init.scripts.runlevel "smb" $["nmb":$["start":["2", "3", "5"]], "smb":$["start":["2", "3", "5"]]] Read .init.scripts.comment "smb" nil -Execute .target.bash_output "/sbin/insserv -r /etc/init.d/smb" $["exit":0] +Execute .target.bash_output "/sbin/chkconfig -d smb" $["exit":0] Return true Modified: trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp Tue Sep 13 10:02:37 2011 @@ -25,7 +25,8 @@ $[ "target" :$[ "bash_output" : $[ "exit" : 0, - ] + ], + "bash" : 1 ] ] ], nil ); @@ -38,7 +39,8 @@ $[ "target" :$[ "bash_output" : $[ "exit" : 0, - ] + ], + "bash" : 1 ] ] ], nil ); @@ -66,12 +68,15 @@ $[ "target" :$[ "bash_output" : $[ "exit" : 0, - ] + ], + "bash" : 0 ] ] ], nil ); TEST( ``("Disable enabled service"), [r,w,x], nil); + import "SambaService"; + // disable service, but it's enabled TEST( ``( YaPI::Samba::EditService( false ) ), [ $[ @@ -94,7 +99,8 @@ $[ "target" :$[ "bash_output" : $[ "exit" : 0, - ] + ], + "bash" : 0 ] ] ], nil ); } Modified: trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out Tue Sep 13 10:02:37 2011 @@ -1,8 +1,9 @@ Return Disabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" nil +Read .target.tmpdir "/tmp" +Read .target.stat "/etc/init.d/smb" nil +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 1 Return 0 Return Enabled service -Read .init.scripts.exists "smb" true -Read .init.scripts.runlevel "smb" $["nmb":$["start":["2", "3", "5"]], "smb":$["start":["2", "3", "5"]]] +Read .target.stat "/etc/init.d/smb" nil +Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 0 Return 1 Modified: trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp Tue Sep 13 10:02:37 2011 @@ -19,13 +19,9 @@ // disabled service TEST( ``( YaPI::Samba::GetServiceStatus() ), [ - $[ "init" : $[ "scripts" : $[ "exists" : true ] ] ], + $[ "init" : $[ "scripts" : $[ "exists" : true ] ], "target" : $["tmpdir":"/tmp"] ], $[], - $[ "target" :$[ "bash_output" : - $[ - "exit" : 0, - ] - ] ] + $[ "target" :$[ "bash" : 1] ] ], nil ); TEST( ``("Enabled service"), [r,w,x], nil); @@ -49,10 +45,6 @@ ], $[], - $[ "target" :$[ "bash_output" : - $[ - "exit" : 0, - ] - ] ] + $[ "target" :$[ "bash" : 0 ] ] ], nil ); } Modified: trunk/samba-server/testsuite/YaPI/tests/tests-common.yh URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/testsuite/YaPI/tests/tests-common.yh?rev=65670&r1=65669&r2=65670&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/tests-common.yh (original) +++ trunk/samba-server/testsuite/YaPI/tests/tests-common.yh Tue Sep 13 10:02:37 2011 @@ -54,7 +54,9 @@ "runlevel": $[ ], ], ], - + "target" : $[ + "tmpdir" : "/tmp" + ] ]; map w_common = -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org