From 8aac17a3ee06b5dc48dc1cca922687d39f66ce11 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Mon, 22 Jul 2013 20:42:28 +0000 Subject: [PATCH] Make the CEL blind transfer test pass consistently git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395074 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- tests/test_cel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/test_cel.c b/tests/test_cel.c index 1f49f7e89f..61d864bd96 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -1094,6 +1094,7 @@ AST_TEST_DEFINE(test_cel_blind_transfer) RAII_VAR(struct ast_bridge *, bridge, NULL, ao2_cleanup); struct ast_party_caller alice_caller = ALICE_CALLERID; struct ast_party_caller bob_caller = BOB_CALLERID; + struct ast_bridge_channel_pair pair; switch (cmd) { case TEST_INIT: @@ -1123,14 +1124,17 @@ AST_TEST_DEFINE(test_cel_blind_transfer) do_sleep(); APPEND_EVENT(chan_bob, AST_CEL_BRIDGE_START, NULL, NULL, ast_channel_name(chan_alice)); + pair.bridge = bridge; + pair.channel = chan_alice; + ast_bridge_publish_blind_transfer(1, AST_BRIDGE_TRANSFER_SUCCESS, + &pair, "transfer_context", "transfer_extension"); BLINDTRANSFER_EVENT(chan_alice, bridge, "transfer_extension", "transfer_context"); - APPEND_EVENT(chan_bob, AST_CEL_BRIDGE_END, NULL, NULL, ast_channel_name(chan_alice)); - ast_bridge_transfer_blind(1, chan_alice, "transfer_extension", "transfer_context", NULL, NULL); + APPEND_EVENT(chan_bob, AST_CEL_BRIDGE_END, NULL, NULL, ast_channel_name(chan_alice)); + ast_test_validate(test, 0 == ast_bridge_depart(chan_alice)); ast_test_validate(test, 0 == ast_bridge_depart(chan_bob)); - HANGUP_CHANNEL(chan_alice, AST_CAUSE_NORMAL, ""); HANGUP_CHANNEL(chan_bob, AST_CAUSE_NORMAL, "");