From eb028fa1df17347e8ddf0c1ae59d57af95883cf8 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 20 Jul 2020 16:46:54 +0200 Subject: [PATCH] tests/fsm_test.c: Disable use color in logging output This should avoid other problems in the future. Change-Id: I81368578c0830477d381566a54671fdde6067b23 --- tests/fsm/fsm_test.c | 1 + tests/fsm/fsm_test.err | 88 +++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index 911aad8c5..fe48b2ba0 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -413,6 +413,7 @@ int main(int argc, char **argv) stderr_target = log_target_create_stderr(); log_add_target(stderr_target); log_set_print_filename(stderr_target, 0); + log_set_use_color(stderr_target, 0); g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL); g_ctx = NULL; diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 13cbacd93..4cc5ca405 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -1,18 +1,18 @@ Checking FSM allocation -Test_FSM(my_id){NULL}: Allocated -Test_FSM(my_id){NULL}: Received Event EV_B -Test_FSM(my_id){NULL}: Event EV_B not permitted -Test_FSM(my_id){NULL}: Received Event EV_A -Test_FSM(my_id){NULL}: State change to ONE (no timeout) -Test_FSM(my_id){ONE}: Received Event EV_B -Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) -Test_FSM(my_id){TWO}: Timeout of T2342 -Timer -Test_FSM(my_id){TWO}: Deallocated - +Test_FSM(my_id){NULL}: Allocated +Test_FSM(my_id){NULL}: Received Event EV_B +Test_FSM(my_id){NULL}: Event EV_B not permitted +Test_FSM(my_id){NULL}: Received Event EV_A +Test_FSM(my_id){NULL}: State change to ONE (no timeout) +Test_FSM(my_id){ONE}: Received Event EV_B +Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s) +Test_FSM(my_id){TWO}: Timeout of T2342 +Timer +Test_FSM(my_id){TWO}: Deallocated + --- test_id_api() Test_FSM{NULL}: Allocated - osmo_fsm_inst_name() == "Test_FSM" + osmo_fsm_inst_name() == "Test_FSM" osmo_fsm_inst_find_by_name("Test_FSM") == fi osmo_fsm_inst_update_id("my_id") rc == 0, ok @@ -39,23 +39,23 @@ osmo_fsm_inst_update_id("arbitrary_id") osmo_fsm_inst_find_by_id("arbitrary_id") == fi osmo_fsm_inst_update_id("") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id("invalid.id") Attempting to set illegal id for FSM instance of type 'Test_FSM': "invalid.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi --- id format tests... osmo_fsm_inst_update_id_f("format%cid", '.') Attempting to set illegal id for FSM instance of type 'Test_FSM': "format.id" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("%s", "") Attempting to set illegal id for FSM instance of type 'Test_FSM': "" - rc == -22, ok + rc == -22, ok osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)" osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi osmo_fsm_inst_update_id_f("format%xid%d", 0x23, 42) @@ -78,41 +78,41 @@ osmo_fsm_inst_update_id_f("%s%c%s", "arbitrary", '_', "id") --- test_id_api() done Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM(arbitrary_id){NULL}: Freeing instance -Test_FSM(arbitrary_id){NULL}: Deallocated - +Test_FSM(arbitrary_id){NULL}: Freeing instance +Test_FSM(arbitrary_id){NULL}: Deallocated + --- test_state_chg_keep_timer() Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (no timeout) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated -Total time passed: 0.000000 s +Test_FSM{NULL}: State change to ONE (no timeout) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Total time passed: 0.000000 s Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (T10, 10s) -Total time passed: 2.000342 s +Test_FSM{NULL}: State change to ONE (T10, 10s) +Total time passed: 2.000342 s Test_FSM{ONE}: State change to TWO (keeping T10, 7.999s remaining) -Total time passed: 2.000342 s +Total time passed: 2.000342 s Total time passed: 9.999999 s Total time passed: 10.000000 s Test_FSM{TWO}: Timeout of T10 -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_keep_timer() done +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_keep_timer() done --- test_state_chg_T() Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated -Test_FSM{NULL}: Allocated -Test_FSM{NULL}: State change to ONE (T42, 23s) -Test_FSM{ONE}: State change to TWO (no timeout) -Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) -Test_FSM{TWO}: Freeing instance -Test_FSM{TWO}: Deallocated ---- test_state_chg_T() done +Test_FSM{NULL}: State change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: State change to ONE (T42, 23s) +Test_FSM{ONE}: State change to TWO (no timeout) +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_T() done