Author: jsuchome Date: Mon Mar 26 11:35:48 2012 New Revision: 67706 URL: http://svn.opensuse.org/viewcvs/yast?rev=67706&view=rev Log: - adpated for recent changes in FileUtils.ycp - 2.22.1 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes 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 Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=67706&r1=67705&r2=67706&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Mon Mar 26 11:35:48 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 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=67706&r1=67705&r2=67706&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Mon Mar 26 11:35:48 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 26 11:21:09 CEST 2012 - jsuchome@suse.cz + +- adpated for recent changes in FileUtils.ycp +- 2.22.1 + +------------------------------------------------------------------- Wed Jan 25 10:43:04 CET 2012 - jsuchome@suse.cz - confirmed license 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=67706&r1=67705&r2=67706&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-EditService.ycp Mon Mar 26 11:35:48 2012 @@ -20,7 +20,14 @@ // enable service, but it's disabled TEST( ``( YaPI::Samba::EditService( true ) ), [ - $[ "init" : $[ "scripts" : $[ "exists" : true ] ] ], + $[ + "init" : $[ + "scripts" : $[ "exists" : true ] + ], + "target" : $[ + "stat" : $[ 1:2 ] + ], + ], $[], $[ "target" :$[ "bash_output" : $[ @@ -34,7 +41,14 @@ // disable service, but it's already disabled TEST( ``( YaPI::Samba::EditService( false ) ), [ - $[ "init" : $[ "scripts" : $[ "exists" : true ] ] ], + $[ + "init" : $[ + "scripts" : $[ "exists" : true ] + ], + "target" : $[ + "stat" : $[ 1:2 ] + ], + ], $[], $[ "target" :$[ "bash_output" : $[ @@ -62,7 +76,9 @@ ], ], ], - + "target" : $[ + "stat" : $[ 1:2 ] + ], ], $[], $[ "target" :$[ "bash_output" : @@ -93,7 +109,9 @@ ], ], ], - + "target" : $[ + "stat" : $[ 1:2 ] + ], ], $[], $[ "target" :$[ "bash_output" : 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=67706&r1=67705&r2=67706&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.out Mon Mar 26 11:35:48 2012 @@ -1,9 +1,9 @@ Return Disabled service Read .target.tmpdir "/tmp" -Read .target.stat "/etc/init.d/smb" nil +Read .target.stat "/etc/init.d/smb" $[1:2] Execute .target.bash "/sbin/chkconfig -l smb | /usr/bin/grep -q '[0-6]:on'" 1 Return 0 Return Enabled service -Read .target.stat "/etc/init.d/smb" nil +Read .target.stat "/etc/init.d/smb" $[1:2] 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=67706&r1=67705&r2=67706&view=diff ============================================================================== --- trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp (original) +++ trunk/samba-server/testsuite/YaPI/tests/YaPI-GetServiceStatus.ycp Mon Mar 26 11:35:48 2012 @@ -19,7 +19,16 @@ // disabled service TEST( ``( YaPI::Samba::GetServiceStatus() ), [ - $[ "init" : $[ "scripts" : $[ "exists" : true ] ], "target" : $["tmpdir":"/tmp"] ], + $[ + "init" : $[ + "scripts" : $[ "exists" : true ] + ], + "target" : $[ + "tmpdir" : "/tmp", + // FileUtils::Exists returns true + "stat" : $[ 1: 2 ], + ] + ], $[], $[ "target" :$[ "bash" : 1] ] ], nil ); @@ -42,7 +51,9 @@ ], ], ], - + "target" : $[ + "stat" : $[ 1: 2 ], + ], ], $[], $[ "target" :$[ "bash" : 0 ] ] -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org