From 2e13870a546aab079d3cb79c754115b26a23db64 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 12 Jul 2016 13:43:41 +0200 Subject: [PATCH] tester: do not gather logs when creating test account, that pollute output too much for something we don't care about This reduces logs from 800K lines to 300K lines for the whole suite. Fair enough. --- tester/liblinphone_tester.c | 1 + tester/presence_server_tester.c | 2 +- tester/rcfiles/pauline_rc | 1 + tester/rcfiles/pauline_tcp_rc | 1 + tester/tester.c | 12 +++++++++++- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index 17503ac0a..45f91fbed 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -229,6 +229,7 @@ int main (int argc, char *argv[]) #endif liblinphone_tester_init(NULL); + linphone_core_set_log_level(ORTP_FATAL); for(i = 1; i < argc; ++i) { if (strcmp(argv[i], "--verbose") == 0) { diff --git a/tester/presence_server_tester.c b/tester/presence_server_tester.c index 25034f834..43c2cd326 100644 --- a/tester/presence_server_tester.c +++ b/tester/presence_server_tester.c @@ -685,7 +685,7 @@ static void long_term_presence_list(void) { LinphoneFriend *f1, *f2; LinphoneFriendList* friends; LinphoneCoreManager *pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - enable_publish(pauline, TRUE); + enable_publish(pauline, FALSE); enable_deflate_content_encoding(pauline, FALSE); friends = linphone_core_create_friend_list(pauline->lc); diff --git a/tester/rcfiles/pauline_rc b/tester/rcfiles/pauline_rc index f2f2c94d5..c5f1fed4d 100644 --- a/tester/rcfiles/pauline_rc +++ b/tester/rcfiles/pauline_rc @@ -15,6 +15,7 @@ realm=sip.example.org [proxy_0] +realm=sip.example.org reg_proxy=sip2.linphone.org;transport=tls reg_route=sip2.linphone.org;transport=tls reg_identity=sip:pauline@sip.example.org diff --git a/tester/rcfiles/pauline_tcp_rc b/tester/rcfiles/pauline_tcp_rc index ff36234b1..5c6b183bd 100644 --- a/tester/rcfiles/pauline_tcp_rc +++ b/tester/rcfiles/pauline_tcp_rc @@ -15,6 +15,7 @@ realm=sip.example.org [proxy_0] +realm=sip.example.org reg_proxy=sip2.linphone.org;transport=tcp reg_route=sip2.linphone.org;transport=tcp reg_identity=sip:pauline@sip.example.org diff --git a/tester/tester.c b/tester/tester.c index 5c5f8c97a..416cb7705 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -390,19 +390,26 @@ void linphone_core_manager_start(LinphoneCoreManager *mgr, int check_for_proxies /*now that stun server resolution is done, we can start registering*/ linphone_core_set_network_reachable(mgr->lc, TRUE); } + } LinphoneCoreManager* linphone_core_manager_new( const char* rc_file) { + int old_log_level = ortp_get_log_level_mask(NULL); LinphoneCoreManager *manager = ms_new0(LinphoneCoreManager, 1); + linphone_core_set_log_level(ORTP_ERROR); linphone_core_manager_init(manager, rc_file); linphone_core_manager_start(manager, TRUE); + linphone_core_set_log_level(old_log_level); return manager; } LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies) { + int old_log_level = ortp_get_log_level_mask(NULL); LinphoneCoreManager *manager = ms_new0(LinphoneCoreManager, 1); + linphone_core_set_log_level(ORTP_ERROR); linphone_core_manager_init(manager, rc_file); linphone_core_manager_start(manager, check_for_proxies); + linphone_core_set_log_level(old_log_level); return manager; } @@ -414,6 +421,8 @@ void linphone_core_manager_stop(LinphoneCoreManager *mgr){ } void linphone_core_manager_uninit(LinphoneCoreManager *mgr) { + int old_log_level = ortp_get_log_level_mask(NULL); + linphone_core_set_log_level(ORTP_ERROR); if (mgr->stat.last_received_chat_message) { linphone_chat_message_unref(mgr->stat.last_received_chat_message); } @@ -423,7 +432,7 @@ void linphone_core_manager_uninit(LinphoneCoreManager *mgr) { char *chatdb = ms_strdup(linphone_core_get_chat_database_path(mgr->lc)); if (!liblinphone_tester_keep_record_files && record_file){ if ((bc_get_number_of_failures()-mgr->number_of_bcunit_error_at_creation)>0) { - ms_message ("Test has failed, keeping recorded file [%s]",record_file); + ms_error("Test has failed, keeping recorded file [%s]",record_file); } else { unlink(record_file); } @@ -439,6 +448,7 @@ void linphone_core_manager_uninit(LinphoneCoreManager *mgr) { } manager_count--; + linphone_core_set_log_level(old_log_level); } void linphone_core_manager_wait_for_stun_resolution(LinphoneCoreManager *mgr) {