From 3d2655181931c1884b4b70632a19db44a8ae601f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 3 Mar 2016 15:56:45 +0100 Subject: [PATCH] tester: untag LeaksMemory for some non-leaking tests --- tester/flexisip_tester.c | 51 ++++++++++++++++++++-------------------- tester/presence_tester.c | 16 ++++++------- tester/setup_tester.c | 2 +- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c index 1cd8d2071..36ef4ee27 100644 --- a/tester/flexisip_tester.c +++ b/tester/flexisip_tester.c @@ -1,19 +1,19 @@ /* - liblinphone_tester - liblinphone test suite - Copyright (C) 2013 Belledonne Communications SARL + liblinphone_tester - liblinphone test suite + Copyright (C) 2013 Belledonne Communications SARL - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ @@ -542,7 +542,7 @@ static void early_media_call_forking(void) { linphone_core_enable_video_capture(pauline->lc,TRUE); linphone_core_enable_video_display(pauline->lc,TRUE); - + linphone_core_enable_video_capture(marie->lc,TRUE); linphone_core_enable_video_display(marie->lc,TRUE); linphone_core_set_video_policy(marie->lc,&pol); @@ -927,7 +927,7 @@ static void test_subscribe_notify_with_sipp_publisher(void) { LpConfig *pauline_lp = linphone_core_get_config(pauline->lc); char* lf_identity=linphone_address_as_string_uri_only(marie->identity); LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); - + linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL); linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL); @@ -942,11 +942,11 @@ static void test_subscribe_notify_with_sipp_publisher(void) { BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d"); scen = bc_tester_res("sipp/simple_publish.xml"); - + sip_example_org = linphone_core_manager_resolve(marie, marie->identity); sipp_out = sip_start(scen, linphone_address_get_username(marie->identity), linphone_auth_info_get_passwd(marie_auth), sip_example_org); linphone_address_destroy(sip_example_org); - + if (sipp_out) { /*wait for marie status*/ BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,2,3000)); @@ -958,19 +958,18 @@ static void test_subscribe_notify_with_sipp_publisher(void) { linphone_core_manager_destroy(pauline); } static void test_subscribe_notify_with_sipp_publisher_double_publish(void) { -#if 0 //does not work because sipp seams not able to manage 2 call id in case file - +#if 0 char *scen; FILE * sipp_out; LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); /*just to get an identity*/ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneAddress *sip_example_org; - + linphone_core_set_user_agent(marie->lc, "full-presence-support", NULL); linphone_core_set_user_agent(pauline->lc, "full-presence-support", NULL); - + LpConfig *pauline_lp = linphone_core_get_config(pauline->lc); char* lf_identity=linphone_address_as_string_uri_only(marie->identity); LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); @@ -984,10 +983,10 @@ static void test_subscribe_notify_with_sipp_publisher_double_publish(void) { BC_ASSERT_EQUAL(LinphoneStatusOffline,linphone_friend_get_status(lf), int, "%d"); scen = bc_tester_res("sipp/double_publish_with_error.xml"); - + sip_example_org = linphone_core_manager_resolve(marie, marie->identity); sipp_out = sip_start(scen, linphone_address_get_username(marie->identity), sip_example_org); - + if (sipp_out) { /*wait for marie status*/ BC_ASSERT_TRUE(wait_for_until(pauline->lc,pauline->lc,&pauline->stat.number_of_NotifyPresenceReceived,2,3000)); @@ -1103,17 +1102,17 @@ static void test_subscribe_on_wrong_dialog(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); const LinphoneAuthInfo *marie_auth = linphone_core_find_auth_info(marie->lc, NULL, linphone_address_get_username(marie->identity), NULL); LinphoneAddress *sip_example_org; - + scen = bc_tester_res("sipp/subscribe_on_wrong_dialog.xml"); sip_example_org = linphone_core_manager_resolve(marie, marie->identity); sipp_out = sip_start(scen, linphone_address_get_username(marie->identity),linphone_auth_info_get_passwd(marie_auth), sip_example_org); linphone_address_destroy(sip_example_org); - + if (sipp_out) { /*wait for marie status*/ BC_ASSERT_EQUAL(0, pclose(sipp_out),int,"%d"); } - + linphone_core_manager_destroy(marie); } @@ -1136,7 +1135,7 @@ test_t flexisip_tests[] = { TEST_ONE_TAG("Call with sips not achievable", call_with_sips_not_achievable, "LeaksMemory"), TEST_NO_TAG("Call with ipv6", call_with_ipv6), TEST_ONE_TAG("Subscribe Notify with sipp publisher", test_subscribe_notify_with_sipp_publisher, "LeaksMemory"), - TEST_ONE_TAG("Subscribe Notify with sipp double publish", test_subscribe_notify_with_sipp_publisher_double_publish, "LeaksMemory"), + /*TEST_ONE_TAG("Subscribe Notify with sipp double publish", test_subscribe_notify_with_sipp_publisher_double_publish, "LeaksMemory"),*/ TEST_NO_TAG("Publish/unpublish", test_publish_unpublish), TEST_ONE_TAG("List subscribe", test_list_subscribe,"LeaksMemory"), TEST_ONE_TAG("File transfer message rcs to external body client", file_transfer_message_rcs_to_external_body_client, "LeaksMemory"), diff --git a/tester/presence_tester.c b/tester/presence_tester.c index c2e4c1dad..f4e214a8a 100644 --- a/tester/presence_tester.c +++ b/tester/presence_tester.c @@ -470,7 +470,7 @@ static void subscribe_presence_expired(void){ ms_list_free(lcs); } -static void subscriber_no_longuer_reachable(void){ +static void subscriber_no_longer_reachable(void){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager* pauline1 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneFriend *lf; @@ -980,16 +980,16 @@ static void test_presence_list_subscribe_io_error(void) { } test_t presence_tests[] = { - TEST_ONE_TAG("Simple Subscribe", simple_subscribe, "LeaksMemory"), + TEST_NO_TAG("Simple Subscribe", simple_subscribe), TEST_ONE_TAG("Simple Publish", simple_publish, "LeaksMemory"), TEST_ONE_TAG("Simple Publish with expires", publish_with_expires, "LeaksMemory"), /*TEST_ONE_TAG("Call with presence", call_with_presence, "LeaksMemory"),*/ - TEST_ONE_TAG("Unsubscribe while subscribing", unsubscribe_while_subscribing, "LeaksMemory"), - TEST_ONE_TAG("Presence information", presence_information, "LeaksMemory"), - TEST_ONE_TAG("App managed presence failure", subscribe_failure_handle_by_app, "LeaksMemory"), - TEST_ONE_TAG("Presence SUBSCRIBE forked", subscribe_presence_forked, "LeaksMemory"), - TEST_ONE_TAG("Presence SUBSCRIBE expired", subscribe_presence_expired, "LeaksMemory"), - TEST_ONE_TAG("Subscriber no loguer reachable using server",subscriber_no_longuer_reachable, "LeaksMemory"), + TEST_NO_TAG("Unsubscribe while subscribing", unsubscribe_while_subscribing), + TEST_NO_TAG("Presence information", presence_information), + TEST_NO_TAG("App managed presence failure", subscribe_failure_handle_by_app), + TEST_NO_TAG("Presence SUBSCRIBE forked", subscribe_presence_forked), + TEST_NO_TAG("Presence SUBSCRIBE expired", subscribe_presence_expired), + TEST_ONE_TAG("Subscriber no longer reachable using server",subscriber_no_longer_reachable, "LeaksMemory"), TEST_ONE_TAG("Subscribe with late publish", test_subscribe_notify_publish, "LeaksMemory"), TEST_ONE_TAG("Forked subscribe with late publish", test_forked_subscribe_notify_publish, "LeaksMemory"), TEST_ONE_TAG("Presence list", test_presence_list, "LeaksMemory"), diff --git a/tester/setup_tester.c b/tester/setup_tester.c index 13d828d37..d1a5531f9 100644 --- a/tester/setup_tester.c +++ b/tester/setup_tester.c @@ -336,7 +336,7 @@ test_t setup_tests[] = { TEST_NO_TAG("Linphone proxy config server address change (internal api)", linphone_proxy_config_is_server_config_changed_test), TEST_NO_TAG("Linphone core init/uninit", core_init_test), TEST_NO_TAG("Linphone random transport port",core_sip_transport_test), - TEST_ONE_TAG("Linphone interpret url", linphone_interpret_url_test, "LeaksMemory"), + TEST_NO_TAG("Linphone interpret url", linphone_interpret_url_test), TEST_NO_TAG("LPConfig from buffer", linphone_lpconfig_from_buffer), TEST_NO_TAG("LPConfig zero_len value from buffer", linphone_lpconfig_from_buffer_zerolen_value), TEST_NO_TAG("LPConfig zero_len value from file", linphone_lpconfig_from_file_zerolen_value),