[netfilter-cvslog] r3540 - in trunk: nfsim/core nfsim-testsuite/02conntrack

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2005-01-02 07:20:59 +0100 (Sun, 02 Jan 2005)
New Revision: 3540

Modified:
   trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim
   trunk/nfsim/core/core.c
   trunk/nfsim/core/expect.c
   trunk/nfsim/core/expect.h
Log:
icmp_reply test was wrong: expect placed on next "gen_ip" not "gen_err" command.
Exit with failure if expectations remain at end of test, fix up 04icmp_reply.sim


Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2005-01-01 08:32:48 UTC (rev 3539)
+++ trunk/nfsim/core/core.c	2005-01-02 06:20:59 UTC (rev 3540)
@@ -26,6 +26,7 @@
 #include "utils.h"
 #include "usage.h"
 #include "field.h"
+#include "expect.h"
 
 #include <unistd.h>
 #include <signal.h>
@@ -430,6 +431,12 @@
 
 	tui_run(!get_failtest(), STDIN_FILENO);
 
+	/* Everyone loves a good error haiku! */
+	if (expects_remaining())
+		barf("Expectations still / "
+		     "unfulfilled remaining. / "
+		     "Testing blossoms fail.");
+
 	message_cleanup();
 	unload_all_modules();
 	check_allocations();

Modified: trunk/nfsim/core/expect.c
===================================================================
--- trunk/nfsim/core/expect.c	2005-01-01 08:32:48 UTC (rev 3539)
+++ trunk/nfsim/core/expect.c	2005-01-02 06:20:59 UTC (rev 3540)
@@ -143,6 +143,11 @@
 	return ret;
 }
 
+bool expects_remaining(void)
+{
+	return expect != NULL;
+}
+
 static void expect_pre_command(const char *command)
 {
 	struct cmdstack *new = talloc(NULL, struct cmdstack);

Modified: trunk/nfsim/core/expect.h
===================================================================
--- trunk/nfsim/core/expect.h	2005-01-01 08:32:48 UTC (rev 3539)
+++ trunk/nfsim/core/expect.h	2005-01-02 06:20:59 UTC (rev 3540)
@@ -27,4 +27,7 @@
 bool expect_log_hook(const char *line);
 void expect_after_command(void);
 
+/* Are there any expect commands unresolved? */
+bool expects_remaining(void);
+
 #endif /* __HAVE_EXPECT_H */

Modified: trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim
===================================================================
--- trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim	2005-01-01 08:32:48 UTC (rev 3539)
+++ trunk/nfsim-testsuite/02conntrack/04icmp_reply.sim	2005-01-02 06:20:59 UTC (rev 3540)
@@ -13,21 +13,21 @@
 iptables -A FORWARD -m state ! --state RELATED -j DROP
 
 # Send a few errors for each one.
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 1 8 0 55 57
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 6 1024 1025 SYN
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 17 1024 1025
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 2
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 1 8 0 55 57
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 6 1024 1025 SYN
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 17 1024 1025
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=20 192.168.1.2 3 0 192.168.0.2 192.168.1.2 0 2
 
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 1 8 0 55 57
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 6 1024 1025 SYN
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 17 1024 1025
-expect gen_ip send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
-gen_err IF=eth1 LEN=8 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 2
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 1 8 0 55 57
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 6 1024 1025 SYN
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=28 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 17 1024 1025
+expect gen_err send:eth0 {IPv4 192.168.1.2 192.168.0.2 *}
+gen_err IF=eth1 LEN=20 192.168.1.2 3 1 192.168.0.2 192.168.1.2 0 2