Author: locilka Date: Tue Jun 21 09:34:17 2011 New Revision: 64494 URL: http://svn.opensuse.org/viewcvs/yast?rev=64494&view=rev Log: Adding testcases, fixing spec file (adding missing required binaries) Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.err branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.out branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/yast2-dns-server.spec.in Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.err?rev=64494&view=auto ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.out?rev=64494&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.out (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.out Tue Jun 21 09:34:17 2011 @@ -0,0 +1,9 @@ +Dump ========================================================== +Return 127.0.0.1 +Return 127.0.0.1 +Return ::1 +Return nil +Dump ========================================================== +Return ["127.0.0.1", "127.0.0.2", "::1", "192.168.5.1", "238.11.26.25", "fe80::21c:c0ff:fe18:f01c"] +Return ["192.168.5.1", "238.11.26.25", "fe80::21c:c0ff:fe18:f01c"] +Dump ========================================================== Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.ycp?rev=64494&view=auto ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerUI.ycp Tue Jun 21 09:34:17 2011 @@ -0,0 +1,40 @@ +{ + // testedfiles: DnsServerUI + + // While running tests, variable Y2ALLGLOBAL makes all functions global + // thus we can test all internal functions + + include "testsuite.ycp"; + + import "DnsServerUI"; + + // DnsServerUI::ChangeIPToLocalEquivalent + DUMP ("=========================================================="); + + list <string> ips = [ + "192.168.5.1", + "238.11.26.25", + "fe80::21c:c0ff:fe18:f01c", + "trash" + ]; + + foreach (string ip, ips, { + TEST (``(DnsServerUI::ChangeIPToLocalEquivalent (ip)), [], nil); + }); + + DUMP ("=========================================================="); + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[ + "target" : $[ + "bash_output" : $["exit" : 0, "stdout" : "127.0.0.1\n127.0.0.2\n::1\n192.168.5.1\n238.11.26.25\nfe80::21c:c0ff:fe18:f01c", "stderr" : ""], + ], + ]; + + // DnsServerUI::CurrentlyUsedIPs + TEST (``(DnsServerUI::CurrentlyUsedIPs (true)), [READ, WRITE, EXEC], nil); + TEST (``(DnsServerUI::CurrentlyUsedIPs (false)), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/yast2-dns-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-server/yast2-dns-server.spec.in?rev=64494&r1=64493&r2=64494&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/yast2-dns-server.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/yast2-dns-server.spec.in Tue Jun 21 09:34:17 2011 @@ -16,6 +16,10 @@ Requires: bind-utils Requires: yast2-ldap Requires: yast2-ldap-client +# /sbin/ip +Requires: iproute2 +# DnsServerUI::CurrentlyUsedIPs +Requires: grep sed # Script /sbin/netconfig 0.71.2+? # FATE #303386: Network setup tools -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org