[tests] fix heavy-wq, add redundant AS_SET test and statics to aspath_test

2006-03-16 Paul Jakma <paul.jakma@sun.com>

	* heavy-wq.c: (heavy_wq_init) delay is gone from workqueue
	  spec.
	* aspath_test.c: (test_segments) Add an AS_SET with redundant
	  ASNs.
	  ({empty_prepend,prepend,parse}_test) add static qualifiers

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0a6dc190a9d5a9abdb0b10d4e16480d37966f946..8f6e0ce849a15980391c67a3784849c8c0d71fa5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16 Paul Jakma <paul.jakma@sun.com>
+
+       * heavy-wq.c: (heavy_wq_init) delay is gone from workqueue
+         spec.
+       * aspath_test.c: (test_segments) Add an AS_SET with redundant
+         ASNs.
+         ({empty_prepend,prepend,parse}_test) add static qualifiers
+
 2006-01-16 Paul Jakma <paul.jakma@sun.com>
 
        * aspath_test.c: (validate) free the temporary aspaths.

diff --git a/tests/aspath_test.c b/tests/aspath_test.c
index beab685ed4b6bf4aee42e1e4293ece3bdd515111..5d510ccac38818e52520ad6cef046cae6d46e120 100644 (file)
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -302,6 +302,20 @@ static struct test_segment {
     0,
     { "", "", 0, 0, 0, 0, 0, 0 },
   },
+  { /* 17 */ 
+    "redundantset",
+    "seq(8466,3,52737,4096,3456) set(7099,8153,8153,8153)",
+    { 0x2,0x5, 0x21,0x12, 0x00,0x03, 0xce,0x01, 0x10,0x00, 0x0d,0x80,
+      0x1,0x4, 0x1b,0xbb, 0x1f,0xd9, 0x1f,0xd9, 0x1f,0xd9 },
+    22,
+    {
+     /* We shouldn't ever /generate/ such paths. However, we should
+      * cope with them fine.
+      */
+     "8466 3 52737 4096 3456 {7099,8153,8153,8153}",
+      "8466 3 52737 4096 3456 {7099,8153,8153,8153}",
+      6, 0, NOT_ALL_PRIVATE, 4096, 4, 8466 },
+  },
   { NULL, NULL, {0}, 0, { NULL, 0, 0 } }
 };
 
@@ -667,7 +681,7 @@ parse_test (struct test_segment *t)
 }
 
 /* prepend testing */
-void
+static void
 prepend_test (struct tests *t)
 {
   struct aspath *asp1, *asp2, *ascratch;
@@ -696,7 +710,7 @@ prepend_test (struct tests *t)
 }
 
 /* empty-prepend testing */
-void
+static void
 empty_prepend_test (struct test_segment *t)
 {
   struct aspath *asp1, *asp2, *ascratch;
@@ -724,7 +738,7 @@ empty_prepend_test (struct test_segment *t)
 }
 
 /* aggregation testing */
-void
+static void
 aggregate_test (struct tests *t)
 {
   struct aspath *asp1, *asp2, *ascratch;

diff --git a/tests/heavy-wq.c b/tests/heavy-wq.c
index 0e12c601370ed83ade44f83c525172ad4f76ddad..3abc38b33db4ad6cbecd5fdb410e7c81b243e9f7 100644 (file)
--- a/tests/heavy-wq.c
+++ b/tests/heavy-wq.c
@@ -1,5 +1,5 @@
 /*
- * $Id: heavy-wq.c,v 1.2 2005/09/05 14:00:09 paul Exp $
+ * $Id: heavy-wq.c,v 1.3 2006/03/30 13:42:50 paul Exp $
  *
  * This file is part of Quagga.
  *
@@ -166,7 +166,6 @@ heavy_wq_init ()
   heavy_wq->spec.errorfunc = &slow_func_err;
   heavy_wq->spec.del_item_data = &slow_func_del;
   heavy_wq->spec.max_retries = 3;
-  heavy_wq->spec.delay = 10;
   heavy_wq->spec.hold = 1000;
   
   return 0;