d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/netgraph: Missed fixup after D30699

Browse Source 
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
This commit is contained in:
Lutz Donnerhacke 2021-06-10 12:21:14 +02:00
parent d409305fa3
commit 0afa9be039
1 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tests/sys/netgraph/basic.c
View File

@ -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)++;
}