The branch main has been updated by donner:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0afa9be03937d60cb5aeba64c81e3e2165bd3737
commit 0afa9be03937d60cb5aeba64c81e3e2165bd3737
Author: Lutz Donnerhacke <don...@freebsd.org>
AuthorDate: 2021-06-10 10:21:14 +0000
Commit: Lutz Donnerhacke <don...@freebsd.org>
CommitDate: 2021-06-13 20:16:52 +0000
tests/netgraph: Missed fixup after D30699
During D30699 the existing basic tests were missed. Furthermore
debugging output was still in the code, which is removed now.
MFC: together with D30699
Differential Revision: https://reviews.freebsd.org/D30714
---
tests/sys/netgraph/basic.c | 59 ++++++++++++++++++----------------------------
1 file changed, 23 insertions(+), 36 deletions(-)
diff --git a/tests/sys/netgraph/basic.c b/tests/sys/netgraph/basic.c
index 614208ba42a8..83a129a1972a 100644
--- a/tests/sys/netgraph/basic.c
+++ b/tests/sys/netgraph/basic.c
@@ -37,8 +37,6 @@
#include "util.h"
-static void get_data(void *data, size_t len, void *ctx);
-
ATF_TC(send_recv);
ATF_TC_HEAD(send_recv, conf)
{
@@ -48,16 +46,16 @@ ATF_TC_HEAD(send_recv, conf)
ATF_TC_BODY(send_recv, dummy)
{
char msg[] = "test";
- int received;
+ ng_counter_t r;
ng_init();
ng_connect(".", "a", ".", "b");
- ng_register_data("b", get_data);
+ ng_register_data("b", get_data0);
ng_send_data("a", msg, sizeof(msg));
- received = 0;
- ng_handle_events(50, &received);
- ATF_CHECK(received == 1);
+ ng_counter_clear(r);
+ ng_handle_events(50, &r);
+ ATF_CHECK(r[0] == 1);
}
ATF_TC(node);
@@ -69,7 +67,7 @@ ATF_TC_HEAD(node, conf)
ATF_TC_BODY(node, dummy)
{
char msg[] = "test";
- int received;
+ ng_counter_t r;
ng_init();
ng_mkpeer(".", "a", "hub", "a");
@@ -78,20 +76,20 @@ ATF_TC_BODY(node, dummy)
ng_connect(".", "b", "test hub:", "b");
ng_connect(".", "c", "test hub:", "c");
- ng_register_data("a", get_data);
- ng_register_data("b", get_data);
- ng_register_data("c", get_data);
+ ng_register_data("a", get_data0);
+ ng_register_data("b", get_data1);
+ ng_register_data("c", get_data2);
- received = 0;
+ ng_counter_clear(r);
ng_send_data("a", msg, sizeof(msg));
- ng_handle_events(50, &received);
- ATF_CHECK(received == 2);
+ ng_handle_events(50, &r);
+ ATF_CHECK(r[0] == 0 && r[1] == 1 && r[2] == 1);
ng_rmhook(".", "b");
- received = 0;
+ ng_counter_clear(r);
ng_send_data("a", msg, sizeof(msg));
- ng_handle_events(50, &received);
- ATF_CHECK(received == 1);
+ ng_handle_events(50, &r);
+ ATF_CHECK(r[0] == 0 && r[1] == 0 && r[2] == 1);
ng_shutdown("test hub:");
}
@@ -146,13 +144,14 @@ ATF_TC_HEAD(queuelimit, conf)
ATF_TC_BODY(queuelimit, dummy)
{
- int received, i;
+ ng_counter_t r;
+ int i;
char msg[] = "test";
const int MAX = 1000;
ng_init();
ng_connect(".", "a", ".", "b");
- ng_register_data("b", get_data);
+ ng_register_data("b", get_data0);
ng_errors(PASS);
for (i = 0; i < MAX; i++)
@@ -163,15 +162,13 @@ ATF_TC_BODY(queuelimit, dummy)
/* no ng_handle_events -> messages stall */
}
ng_errors(FAIL);
- printf("queued %d\n", i);
- sleep(3);
- received = 0;
- ng_handle_events(50, &received);
- ATF_CHECK(received > 100);
- ATF_CHECK(received == i);
+ ng_counter_clear(r);
+ ng_handle_events(50, &r);
+ ATF_CHECK(r[0] > 100);
+ ATF_CHECK(r[0] == i);
atf_tc_expect_fail("Queue full (%d)", i);
- ATF_CHECK(received == MAX);
+ ATF_CHECK(r[0] == MAX);
atf_tc_expect_pass();
}
@@ -185,13 +182,3 @@ ATF_TP_ADD_TCS(basic)
return atf_no_error();
}
-
-static void
-get_data(void *data, size_t len, void *ctx)
-{
- int *cnt = ctx;
-
- (void)data;
- printf("Got %zu bytes of data.\n", len);
- (*cnt)++;
-}
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
