[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 0a6dc19..8f6e0ce 100644
--- 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 beab685..5d510cc 100644
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -302,6 +302,20 @@
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 @@
}
/* prepend testing */
-void
+static void
prepend_test (struct tests *t)
{
struct aspath *asp1, *asp2, *ascratch;
@@ -696,7 +710,7 @@
}
/* empty-prepend testing */
-void
+static void
empty_prepend_test (struct test_segment *t)
{
struct aspath *asp1, *asp2, *ascratch;
@@ -724,7 +738,7 @@
}
/* 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 0e12c60..3abc38b 100644
--- 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->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;