From ac5401475166eacf71e9cc947898a0c2cc392ad5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 17 Feb 2014 13:02:55 +0100 Subject: [PATCH] Few more fixes for the tester --- tester/Makefile.am | 2 +- tester/marie_remote_https_rc | 2 ++ tester/pauline_remote_rc | 2 -- tester/pauline_xml | 45 ----------------------------- tester/remote_provisioning_tester.c | 9 +++--- tester/setup_tester.c | 1 - 6 files changed, 8 insertions(+), 53 deletions(-) create mode 100644 tester/marie_remote_https_rc delete mode 100644 tester/pauline_remote_rc delete mode 100644 tester/pauline_xml diff --git a/tester/Makefile.am b/tester/Makefile.am index dde662c18..f5344b13f 100644 --- a/tester/Makefile.am +++ b/tester/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST= empty_rc laure_rc marie_early_rc marie_no_sdp_rc marie_rc multi_account_lrc pauline_alt_rc \ - marie_remote_rc pauline_remote_rc marie_remote_404_rc marie_remote_invalid_rc \ + marie_remote_rc marie_remote_https_rc marie_remote_404_rc marie_remote_invalid_rc \ pauline_rc pauline_wild_rc pauline_tcp_rc tester_hosts sounds images certificates diff --git a/tester/marie_remote_https_rc b/tester/marie_remote_https_rc new file mode 100644 index 000000000..cc5343c30 --- /dev/null +++ b/tester/marie_remote_https_rc @@ -0,0 +1,2 @@ +[misc] +config-uri=https://smtp.linphone.org/marie_xml diff --git a/tester/pauline_remote_rc b/tester/pauline_remote_rc deleted file mode 100644 index 3594a2f94..000000000 --- a/tester/pauline_remote_rc +++ /dev/null @@ -1,2 +0,0 @@ -[misc] -config-uri=https://smtp.linphone.org/pauline_xml diff --git a/tester/pauline_xml b/tester/pauline_xml deleted file mode 100644 index cc952af82..000000000 --- a/tester/pauline_xml +++ /dev/null @@ -1,45 +0,0 @@ - - -
- -1 - -1 - -1 - 0 - 0 - 0 - 1 -
-
- pauline - pauline - secret - sip.example.org -
-
- sip2.linphone.org;transport=tls - sip2.linphone.org;transport=tls - sip:pauline@sip.example.org - 3600 - 1 - 0 - 0 -
-
- 8090 - 9092 -
-
- 0 - 0 - 0 - vga - 0 - 0 - 0 - 0 - StaticImage: Static picture -
-
- 0 #to not overload cpu in case of VG -
- diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c index 95362b5a9..04ced1444 100644 --- a/tester/remote_provisioning_tester.c +++ b/tester/remote_provisioning_tester.c @@ -49,12 +49,13 @@ static void remote_provisioning_http(void) { } static void remote_provisioning_https(void) { - LinphoneCoreManager* pauline = linphone_core_manager_new2("pauline_remote_rc", FALSE); + LinphoneCoreManager* marie = linphone_core_manager_new2("marie_remote_https_rc", FALSE); char rootcapath[256] = {0}; snprintf(rootcapath, sizeof(rootcapath), "%s/rootca.pem", liblinphone_tester_file_prefix); - linphone_core_set_root_ca(pauline->lc, rootcapath); - CU_ASSERT_TRUE(wait_for(pauline->lc,NULL,&pauline->stat.number_of_LinphoneConfiguringSuccessful,1)); - linphone_core_manager_destroy(pauline); + linphone_core_set_root_ca(marie->lc, rootcapath); + CU_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneConfiguringSuccessful,1)); + CU_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneRegistrationOk,1)); + linphone_core_manager_destroy(marie); } static void remote_provisioning_not_found(void) { diff --git a/tester/setup_tester.c b/tester/setup_tester.c index 31e12a733..0e4299dbc 100644 --- a/tester/setup_tester.c +++ b/tester/setup_tester.c @@ -48,7 +48,6 @@ static void core_sip_transport_test(void) { linphone_core_get_sip_transports(lc,&tr); CU_ASSERT_EQUAL(tr.udp_port,5060); /*default config*/ CU_ASSERT_EQUAL(tr.tcp_port,5060); /*default config*/ - CU_ASSERT_EQUAL(tr.tls_port,LC_SIP_TRANSPORT_RANDOM); /*default config*/ tr.udp_port=LC_SIP_TRANSPORT_RANDOM; tr.tcp_port=LC_SIP_TRANSPORT_RANDOM;