[netfilter-cvslog] r3527 - trunk/nfsim-testsuite/01iptables

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-31 08:05:58 +0100 (Fri, 31 Dec 2004)
New Revision: 3527

Modified:
   trunk/nfsim-testsuite/01iptables/20ipt_MARK-v1.sim
   trunk/nfsim-testsuite/01iptables/20ipt_MARK.sim
Log:
More specific tests for failure, to avoid --failtest time explosion.


Modified: trunk/nfsim-testsuite/01iptables/20ipt_MARK-v1.sim
===================================================================
--- trunk/nfsim-testsuite/01iptables/20ipt_MARK-v1.sim	2004-12-31 07:05:02 UTC (rev 3526)
+++ trunk/nfsim-testsuite/01iptables/20ipt_MARK-v1.sim	2004-12-31 07:05:58 UTC (rev 3527)
@@ -1,7 +1,7 @@
 # Test the ipt_MARK target v1 options.
 # Not merged in kernel or iptables yet, fails on everything:
+# XFAIL:linux:*
 # XFAIL:iptables:*
-# XFAIL:linux:*
 
 # Test new-style, insert and delete.
 iptables -t mangle -A PREROUTING -j MARK --or-mark 7
@@ -43,18 +43,21 @@
 
 # Delete old-style.
 iptables -t mangle -D PREROUTING -j MARK --set-mark 7
+expect iptables iptables: *that*
 expect iptables iptables: command failed
 iptables -t mangle -D PREROUTING -j MARK --set-mark 7
 iptables -t mangle -A PREROUTING -j MARK --set-mark 7
 
 # Delete or.
 iptables -t mangle -D PREROUTING -j MARK --or-mark 7
+expect iptables iptables: *that*
 expect iptables iptables: command failed
 iptables -t mangle -D PREROUTING -j MARK --or-mark 7
 iptables -t mangle -A PREROUTING -j MARK --or-mark 7
 
 # Delete and.
 iptables -t mangle -D PREROUTING -j MARK --and-mark 7
+expect iptables iptables: *that*
 expect iptables iptables: command failed
 iptables -t mangle -D PREROUTING -j MARK --and-mark 7
 iptables -t mangle -A PREROUTING -j MARK --and-mark 7

Modified: trunk/nfsim-testsuite/01iptables/20ipt_MARK.sim
===================================================================
--- trunk/nfsim-testsuite/01iptables/20ipt_MARK.sim	2004-12-31 07:05:02 UTC (rev 3526)
+++ trunk/nfsim-testsuite/01iptables/20ipt_MARK.sim	2004-12-31 07:05:58 UTC (rev 3527)
@@ -2,11 +2,17 @@
 
 # Test old-style first, insert and delete.
 iptables -t mangle -A PREROUTING -j MARK --set-mark 7
+# Either:
+#  iptables: Bad rule (does a matching rule exist in that chain?)
+# OR
+#  iptables: No chain/target/match by that name
+expect iptables iptables: *that*
 expect iptables iptables: command failed
 iptables -t mangle -D PREROUTING -j MARK --set-mark 8
 iptables -t mangle -D PREROUTING -j MARK --set-mark 7
 
 iptables -t mangle -A PREROUTING -s 192.160.0.2 -j MARK --set-mark 7
+expect iptables iptables: *that*
 expect iptables iptables: command failed
 iptables -t mangle -D PREROUTING -s 192.160.0.2 -j MARK --set-mark 8
 iptables -t mangle -D PREROUTING -s 192.160.0.2 -j MARK --set-mark 7
@@ -18,6 +24,7 @@
 iptables -t mangle -D PREROUTING -j MARK --set-mark 7
 
 # Other tables than mangle should fail
+expect iptables WARN:MARK: can only be called from "mangle" table, not "filter"
 expect iptables iptables: command failed
 iptables -t filter -A FORWARD -j MARK --set-mark 7