Change in libosmocore[master]: tests: Set print_category values explicitly

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sat Feb 20 17:13:59 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22961 )

Change subject: tests: Set print_category values explicitly
......................................................................

tests: Set print_category values explicitly

This will alow easily changing default values for print_category vs
print_category_hex later.

In any case, every test relying on logging output validation should
always explicitly state the config to avoid issues in the future if
default values change.

Related: OS#5034
Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28
---
M tests/fsm/fsm_test.c
M tests/gb/bssgp_fc_test.c
M tests/gb/gprs_ns2_test.c
M tests/gb/gprs_ns_test.c
M tests/gsup/gsup_test.c
M tests/logging/logging_test.c
M tests/loggingrb/loggingrb_test.c
M tests/oap/oap_client_test.c
M tests/socket/socket_sctp_test.c
M tests/socket/socket_test.c
M tests/write_queue/wqueue_test.c
11 files changed, 19 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  daniel: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c
index fe48b2b..23e24cf 100644
--- a/tests/fsm/fsm_test.c
+++ b/tests/fsm/fsm_test.c
@@ -414,6 +414,8 @@
 	log_add_target(stderr_target);
 	log_set_print_filename(stderr_target, 0);
 	log_set_use_color(stderr_target, 0);
+	log_set_print_category(stderr_target, 0);
+	log_set_print_category_hex(stderr_target, 0);
 	g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL);
 
 	g_ctx = NULL;
diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c
index cc38777..23bcd57 100644
--- a/tests/gb/bssgp_fc_test.c
+++ b/tests/gb/bssgp_fc_test.c
@@ -149,6 +149,8 @@
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 
 	tall_msgb_ctx = msgb_talloc_ctx_init(ctx, 0);
 
diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c
index d8ed06f..37719a9 100644
--- a/tests/gb/gprs_ns2_test.c
+++ b/tests/gb/gprs_ns2_test.c
@@ -524,6 +524,8 @@
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_log_level(osmo_stderr_target, LOGL_INFO);
 	unitdata = talloc_zero(ctx, struct osmo_wqueue);
 	osmo_wqueue_init(unitdata, 100);
diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c
index f70e493..e8e8b80 100644
--- a/tests/gb/gprs_ns_test.c
+++ b/tests/gb/gprs_ns_test.c
@@ -904,6 +904,8 @@
 	void *ctx = talloc_named_const(NULL, 0, "gprs_ns_test");
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
 	osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);
 
diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c
index f34ac7a..f84072c 100644
--- a/tests/gsup/gsup_test.c
+++ b/tests/gsup/gsup_test.c
@@ -752,6 +752,7 @@
 	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_use_color(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
 
 	test_gsup_messages_dec_enc();
diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c
index b9cb57f..d036dc5 100644
--- a/tests/logging/logging_test.c
+++ b/tests/logging/logging_test.c
@@ -78,6 +78,7 @@
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
 	log_set_print_filename(stderr_target, 0);
+	log_set_print_category_hex(stderr_target, 0);
 	log_set_print_category(stderr_target, 1);
 	log_set_use_color(stderr_target, 0);
 
diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c
index 0b2ae5b..4a4d1f9 100644
--- a/tests/loggingrb/loggingrb_test.c
+++ b/tests/loggingrb/loggingrb_test.c
@@ -65,6 +65,8 @@
 	log_add_target(ringbuf_target);
 	log_set_all_filter(ringbuf_target, 1);
 	log_set_print_filename(ringbuf_target, 0);
+	log_set_print_category(ringbuf_target, 0);
+	log_set_print_category_hex(ringbuf_target, 0);
 
 	log_parse_category_mask(ringbuf_target, "DRLL:DCC");
 	log_parse_category_mask(ringbuf_target, "DRLL");
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index dadf2ee..0ac32ea 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -261,6 +261,7 @@
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_timestamp(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 	log_set_print_category(osmo_stderr_target, 1);
 	log_parse_category_mask(osmo_stderr_target, "DLOAP,1");
 
diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c
index e70b8be..9705038 100644
--- a/tests/socket/socket_sctp_test.c
+++ b/tests/socket/socket_sctp_test.c
@@ -223,6 +223,8 @@
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 #ifdef HAVE_LIBSCTP
 	test_sockinit2_multiaddr_simple();
 	test_sockinit2_multiaddr_several();
diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c
index 0bf2127..9619553 100644
--- a/tests/socket/socket_test.c
+++ b/tests/socket/socket_test.c
@@ -401,6 +401,8 @@
 	osmo_init_logging2(ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
 
 	test_sockinit();
 	test_sockinit2();
diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c
index 827e4e8..9c7a36e 100644
--- a/tests/write_queue/wqueue_test.c
+++ b/tests/write_queue/wqueue_test.c
@@ -73,6 +73,8 @@
 	stderr_target = log_target_create_stderr();
 	log_add_target(stderr_target);
 	log_set_print_filename(stderr_target, 0);
+	log_set_print_category_hex(stderr_target, 0);
+	log_set_print_category(stderr_target, 0);
 
 	test_wqueue_limit();
 

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22961
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28
Gerrit-Change-Number: 22961
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210220/a0e65e19/attachment.htm>


More information about the gerrit-log mailing list