[netfilter-cvslog] r3577 - in trunk/nfsim-testsuite: 01iptables 03NAT

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-01-05 22:40:48 +0100 (Wed, 05 Jan 2005)
New Revision: 3577

Modified:
   trunk/nfsim-testsuite/01iptables/36ipt_multiport-bad-args.sim
   trunk/nfsim-testsuite/01iptables/44multiport-r1.sim
   trunk/nfsim-testsuite/03NAT/66amanda.sim
Log:
Multiport: fix unhandled failures with --failtest.
66amanda: ip_conntrack_expect_related() refreshes matching expectation even though connection is different, failing test.


Modified: trunk/nfsim-testsuite/01iptables/36ipt_multiport-bad-args.sim
===================================================================
--- trunk/nfsim-testsuite/01iptables/36ipt_multiport-bad-args.sim	2005-01-05 15:21:15 UTC (rev 3576)
+++ trunk/nfsim-testsuite/01iptables/36ipt_multiport-bad-args.sim	2005-01-05 21:40:48 UTC (rev 3577)
@@ -14,20 +14,26 @@
 
 # Multiport doesn't support multiple options. (expecting: failure)
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -p tcp -m multiport --sports 1 --dports 2 --ports 3
 expect iptables iptables: command failed
 iptables -I INPUT -p tcp -m multiport --sports 1 --dports 2
 
 # Can we override ourself ? (expecting: failure)
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -p tcp -m multiport --sports 1 --sports 1
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -p tcp -m multiport --dports 2 --dports 2
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -p tcp -m multiport --ports 3 --ports 3
 
 # Reject ICMP and ALL (expecting: failure)
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -p icmp -m multiport --ports 3
 expect iptables iptables: command failed
+expect iptables *multiport*
 iptables -I INPUT -m multiport --ports 3

Modified: trunk/nfsim-testsuite/01iptables/44multiport-r1.sim
===================================================================
--- trunk/nfsim-testsuite/01iptables/44multiport-r1.sim	2005-01-05 15:21:15 UTC (rev 3576)
+++ trunk/nfsim-testsuite/01iptables/44multiport-r1.sim	2005-01-05 21:40:48 UTC (rev 3577)
@@ -55,9 +55,11 @@
 expect gen_ip hook:NF_IP_LOCAL_IN iptable_filter NF_DROP {IPv4 192.168.0.2 192.168.0.1 0 6 1501 1 SYN}
 gen_ip IF=eth0 192.168.0.2 192.168.0.1 0 6 1501 1 SYN
 
+expect gen_ip send:LOCAL *
 expect gen_ip hook:NF_IP_LOCAL_IN iptable_filter NF_ACCEPT {IPv4 192.168.0.2 192.168.0.1 0 6 1499 1 SYN}
 gen_ip IF=eth0 192.168.0.2 192.168.0.1 0 6 1499 1 SYN
 
+expect gen_ip send:LOCAL *
 expect gen_ip hook:NF_IP_LOCAL_IN iptable_filter NF_ACCEPT {IPv4 192.168.0.2 192.168.0.1 0 6 1502 1 SYN}
 gen_ip IF=eth0 192.168.0.2 192.168.0.1 0 6 1502 1 SYN
 

Modified: trunk/nfsim-testsuite/03NAT/66amanda.sim
===================================================================
--- trunk/nfsim-testsuite/03NAT/66amanda.sim	2005-01-05 15:21:15 UTC (rev 3576)
+++ trunk/nfsim-testsuite/03NAT/66amanda.sim	2005-01-05 21:40:48 UTC (rev 3577)
@@ -1,5 +1,10 @@
 # Track the AMANDA backup protocol.  UDP port 10080.
 
+# resent_expect is broken: it should compare which conntrack is asking for
+# expect.
+# XFAIL:linux:2.6.?
+# XFAIL:linux:2.6.10
+
 # Destination NAT: server's reply is to be mangled.
 iptables -t nat -A PREROUTING -d 192.168.1.2 -j DNAT --to-dest 192.168.1.13