robustize tests

This commit is contained in:
Simon Morlat 2015-08-09 17:22:15 +02:00
parent 75f2ce0632
commit aad1cc0715
2 changed files with 12 additions and 9 deletions

View file

@ -42,7 +42,9 @@ liblinphonetester_la_LDFLAGS= -no-undefined
liblinphonetester_la_LIBADD= ../coreapi/liblinphone.la $(CUNIT_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/coreapi -I$(top_srcdir)/tester/common
AM_CFLAGS = -DBC_CONFIG_FILE=\"config.h\" $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) -DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) $(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
AM_CFLAGS = -DBC_CONFIG_FILE=\"config.h\" $(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) \
-DIN_LINPHONE $(ORTP_CFLAGS) $(MEDIASTREAMER_CFLAGS) $(CUNIT_CFLAGS) \
$(BELLESIP_CFLAGS) $(LIBXML2_CFLAGS) $(SQLITE3_CFLAGS)
if BUILD_GTK_UI

View file

@ -343,19 +343,20 @@ static void compatible_avpf_features(void) {
LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
LinphonePayloadType *lpt;
bool_t call_ok;
if (configure_core_for_avpf_and_video(marie->lc) == NULL) goto end;
lpt = configure_core_for_avpf_and_video(pauline->lc);
BC_ASSERT_TRUE(call(marie, pauline));
BC_ASSERT_TRUE((call_ok=call(marie, pauline)));
if (!call_ok) goto end;
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
check_avpf_features(marie->lc, lpt->avpf.features);
check_avpf_features(pauline->lc, lpt->avpf.features);
linphone_core_terminate_all_calls(marie->lc);
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
end_call(marie,pauline);
end:
linphone_core_manager_destroy(pauline);
linphone_core_manager_destroy(marie);
@ -365,20 +366,20 @@ static void incompatible_avpf_features(void) {
LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc");
LinphonePayloadType *lpt;
bool_t call_ok;
if (configure_core_for_avpf_and_video(marie->lc) == NULL) goto end;
lpt = configure_core_for_avpf_and_video(pauline->lc);
lpt->avpf.features = PAYLOAD_TYPE_AVPF_NONE;
BC_ASSERT_TRUE(call(marie, pauline));
BC_ASSERT_TRUE(call_ok=call(marie, pauline));
if (!call_ok) goto end;
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 1));
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 1));
check_avpf_features(marie->lc, PAYLOAD_TYPE_AVPF_NONE);
check_avpf_features(pauline->lc, PAYLOAD_TYPE_AVPF_NONE);
linphone_core_terminate_all_calls(marie->lc);
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &marie->stat.number_of_LinphoneCallEnd, 1));
BC_ASSERT_TRUE(wait_for(marie->lc, pauline->lc, &pauline->stat.number_of_LinphoneCallEnd, 1));
end_call(marie,pauline);
end:
linphone_core_manager_destroy(pauline);
linphone_core_manager_destroy(marie);