mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-28 09:17:02 +00:00
Code Releases Activity

Fixed main birdloop init in unit tests

Browse Source 
Some unit tests weren't initializing the birdloop, trying to write the
birdloop ping into stdin. Fixed this and also forced stdin close on
startup of every test just to be sure that CI and local build behave the
same in this. (CI was failing on this while local build not.)
This commit is contained in:
Maria Matejka 2022-08-01 15:17:41 +02:00
parent f60f7dfdee
commit f1d6c66a78
3 changed files with 5 additions and 5 deletions

3
lib/event_test.c

@ -54,7 +54,6 @@ t_ev_run_list(void)
int i;
olock_init();
birdloop_init();
rt_init();
io_init();
if_init();
@ -81,9 +80,7 @@ main(int argc, char *argv[])
{
bt_init(argc, argv);
the_bird_lock();
bt_test_suite(t_ev_run_list, "Schedule and run 3 events in right order.");
the_bird_unlock();
return bt_exit_value();
}

5
test/birdtest.c

@ -65,6 +65,9 @@ bt_init(int argc, char *argv[])
{
int c;
/* We have no interest in stdin */
close(0);
initstate(BT_RANDOM_SEED, (char *) bt_random_state, sizeof(bt_random_state));
bt_verbose = 0;
@ -121,9 +124,11 @@ bt_init(int argc, char *argv[])
clock_gettime(CLOCK_MONOTONIC, &bt_begin);
bt_suite_case_begin = bt_suite_begin = bt_begin;
the_bird_lock();
resource_init();
ev_init_list(&global_event_list, &main_birdloop, "Global event list in unit tests");
ev_init_list(&global_work_list, &main_birdloop, "Global work list in unit tests");
birdloop_init();
return;
usage:

2
test/bt-utils.c

@ -62,9 +62,7 @@ bt_bird_init(void)
log_init_debug("");
log_switch(bt_verbose != 0, NULL, NULL);
the_bird_lock();
olock_init();
birdloop_init();
rt_init();
io_init();
if_init();