From 44db48229dc9b30eabf9a5ec442233c0fca76378 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 18 Oct 2016 23:37:15 +0200 Subject: [PATCH] Add troubleshooting in video call test suite. --- tester/call_video_tester.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/tester/call_video_tester.c b/tester/call_video_tester.c index 3c511c9c8..4187a8f39 100644 --- a/tester/call_video_tester.c +++ b/tester/call_video_tester.c @@ -924,20 +924,24 @@ static void _call_with_ice_video(LinphoneVideoPolicy caller_policy, LinphoneVide BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection)); check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts); nb_media_starts++; - - if (video_added_by_caller) { - BC_ASSERT_TRUE(add_video(marie, pauline, FALSE)); - } else if (video_added_by_callee) { - BC_ASSERT_TRUE(add_video(pauline, marie, FALSE)); - } - if (video_added_by_caller || video_added_by_callee) { - BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection)); - if (linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))){ - /* Wait for ICE reINVITEs to complete if video was really added */ - BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 4) - && wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 4)); - check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts); - nb_media_starts++; + + if (caller_policy.automatically_initiate && callee_policy.automatically_accept && (video_added_by_caller || video_added_by_callee)){ + BC_FAIL("Tired developer detected. You have requested the test to add video while it is already established from the beginning of the call."); + }else{ + if (video_added_by_caller) { + BC_ASSERT_TRUE(add_video(marie, pauline, FALSE)); + } else if (video_added_by_callee) { + BC_ASSERT_TRUE(add_video(pauline, marie, FALSE)); + } + if (video_added_by_caller || video_added_by_callee) { + BC_ASSERT_TRUE(check_ice(pauline, marie, LinphoneIceStateHostConnection)); + if (linphone_call_params_video_enabled(linphone_call_get_current_params(linphone_core_get_current_call(marie->lc)))){ + /* Wait for ICE reINVITEs to complete if video was really added */ + BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneCallStreamsRunning, 4) + && wait_for(pauline->lc, pauline->lc, &marie->stat.number_of_LinphoneCallStreamsRunning, 4)); + check_nb_media_starts(pauline, marie, nb_media_starts, nb_media_starts); + nb_media_starts++; + } } }