From 738a98b69cbc8a9b233fad0e17a895850fbbe88b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 16 Sep 2015 16:17:18 +0200 Subject: [PATCH] LinphoneUITester: reuse MESSAGE logs level (...) but turn it off for chat tests because they are spamming way too much --- Classes/LinphoneManager.m | 4 ++-- Classes/Utils/FileTransferDelegate.m | 3 +-- TestsUI/ChatTester.m | 3 +++ submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index cba11771f..270b5f089 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -2102,9 +2102,9 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1 - (void)setLogsEnabled:(BOOL)enabled { if ([LinphoneManager isRunningTests]) { - NSLog(@"Running tests, forcing logs to Warning level"); + NSLog(@"Running tests, forcing logs to MESSAGE level"); linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); - linphone_core_set_log_level(ORTP_WARNING); + linphone_core_set_log_level(ORTP_MESSAGE); } else { if (enabled) { NSLog(@"Enabling debug logs"); diff --git a/Classes/Utils/FileTransferDelegate.m b/Classes/Utils/FileTransferDelegate.m index 28b74008d..f9fdf0d07 100644 --- a/Classes/Utils/FileTransferDelegate.m +++ b/Classes/Utils/FileTransferDelegate.m @@ -194,8 +194,7 @@ static LinphoneBuffer *linphone_iphone_file_transfer_send(LinphoneChatMessage *m linphone_chat_message_cbs_set_file_transfer_send(linphone_chat_message_get_callbacks(msg), NULL); linphone_chat_message_cbs_set_file_transfer_recv(linphone_chat_message_get_callbacks(msg), NULL); // when we cancel file transfer, this will automatically trigger NotDelivered callback... recalling ourself a - // second time - // so we have to unset message BEFORE calling this + // second time so we have to unset message BEFORE calling this linphone_chat_message_cancel_file_transfer(msg); linphone_chat_message_unref(msg); } diff --git a/TestsUI/ChatTester.m b/TestsUI/ChatTester.m index e8774b587..262a3c5da 100644 --- a/TestsUI/ChatTester.m +++ b/TestsUI/ChatTester.m @@ -16,6 +16,8 @@ - (void)beforeAll { [super beforeAll]; [self switchToValidAccountIfNeeded]; + // turn off logs for chat tests because there are way to much logs in liblinphone in filetransfer and sqlite + linphone_core_set_log_level(ORTP_WARNING); } - (void)beforeEach { @@ -29,6 +31,7 @@ - (void)afterAll { [super afterAll]; + linphone_core_set_log_level(ORTP_MESSAGE); // at the end of tests, go back to chat rooms to display main bar if ([tester tryFindingTappableViewWithAccessibilityLabel:@"Back" error:nil]) { [self goBackFromChat]; diff --git a/submodules/belle-sip b/submodules/belle-sip index 298264c56..b1707d976 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 298264c56d933a9305395439c988d6ad916a3266 +Subproject commit b1707d976a90afa8079655ac1f9f0eef23dc5709 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 015037369..6f9dde2b9 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 0150373697676183e6735d69620d6e7dc5545134 +Subproject commit 6f9dde2b9fd2dd64a0e0bab87cf3e0b30290da1d diff --git a/submodules/linphone b/submodules/linphone index 654990ac5..fdf5abefd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 654990ac5c221f87b1ea97e8bf2f3c7639d6d96b +Subproject commit fdf5abefd67249b2270ceb605ebd1b61744e6811