Author: mzugec Date: Thu Sep 17 09:47:01 2009 New Revision: 58670 URL: http://svn.opensuse.org/viewcvs/yast?rev=58670&view=rev Log: fixed testsuite Modified: trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.out?rev=58670&r1=58669&r2=58670&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Thu Sep 17 09:47:01 2009 @@ -37,4 +37,6 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-usb" nil Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-pcmcia" nil Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil -Return $["dns":$["dnsdomains":["suse.cz", "suse.de"], "dnsservers":["208.67.222.222", "208.67.220.220"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] +Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] +Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.ycp?rev=58670&r1=58669&r2=58670&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Thu Sep 17 09:47:01 2009 @@ -5,7 +5,8 @@ map READ = $[ "target" : $[ "size":27, - "string" : "laptop.suse.cz" + "string" : "laptop.suse.cz", + "bash_output" : "laptop.suse.cz" ], "sysconfig": $[ "network" : $[ @@ -29,6 +30,14 @@ "routes" : [ $["destination":"default", "gateway":"10.20.30.40"] ] ]; -TEST(``(YaPI::NETWORK::Read()), [READ], nil); +map EXEC = $[ + "target" : $[ + "bash_output" : $[ + "exit" : 0, + "stdout" : "laptop.suse.cz" + ] + ] + ]; +TEST(``(YaPI::NETWORK::Read()), [READ, $[], EXEC], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org