Author: kmachalkova Date: Mon Dec 7 18:03:14 2009 New Revision: 59990 URL: http://svn.opensuse.org/viewcvs/yast?rev=59990&view=rev Log: Fixed testsuite Modified: trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp trunk/network/testsuite/tests/Routing.out Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.out?rev=59990&r1=59989&r2=59990&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Mon Dec 7 18:03:14 2009 @@ -11,6 +11,8 @@ Read .target.string "/etc/HOSTNAME" "laptop.suse.cz" Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil Dir .network.section: ["eth0", "eth1"] Dir .network.value."eth0": ["BOOTPROTO"] @@ -37,9 +39,12 @@ Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] +Read .init.scripts.exists "SuSEfirewall2_init" false Read .sysconfig.sysctl.IP_FORWARD nil +Read .init.scripts.exists "SuSEfirewall2_init" false Write .sysconfig.sysctl.IP_FORWARD "no" true Write .sysconfig.sysctl.IPV6_FORWARD "no" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 0 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 27 Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.ycp?rev=59990&r1=59989&r2=59990&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Mon Dec 7 18:03:14 2009 @@ -3,6 +3,11 @@ import "YaPI::NETWORK"; map READ = $[ + "init" : $[ + "scripts" :$[ + "exists" : false + ] + ], "target" : $[ "size":27, "string" : "laptop.suse.cz", Modified: trunk/network/testsuite/tests/Routing.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Routing.out?rev=59990&r1=59989&r2=59990&view=diff ============================================================================== --- trunk/network/testsuite/tests/Routing.out (original) +++ trunk/network/testsuite/tests/Routing.out Mon Dec 7 18:03:14 2009 @@ -8,6 +8,7 @@ Return true Write .sysconfig.sysctl.IP_FORWARD "yes" true Write .sysconfig.sysctl.IPV6_FORWARD "yes" true +Write .sysconfig.sysctl nil true Execute .target.bash "echo 1 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org