diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-09-23 14:29:01 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-09-23 14:29:01 +0000 |
| commit | d25390073bd3c784d0e05e03d82200a88927cabc (patch) | |
| tree | 32eabf2b563d5a2ac5aa633f2c46aedca793e818 /tests/test_cel.c | |
| parent | 0f3540553dc320f4322acff9b8c6be40ac8f7dda (diff) | |
Make CDR and CEL unit tests less FRACKy.
Prior to this commit, CDR and CEL tests were expected to trigger
FRACKs (i.e. assertions) due to the fact that the channels they
create have no formats on them. Some code was independently added
recently that attempts to prevent FRACKs from occurring by failing
early when attempting to set up translation paths if one or both
channels support no formats. Unfortunately, this attempt to be helpful
made the CDR and CEL tests go from simply FRACKing to outright
failing and in some cases, failing so badly as to crash Asterisk.
This commit seeks to correct past mistakes by adding the ulaw format
to channels created by the CDR and CEL unit tests. This makes setting
up translation paths succeed, eliminates previously-seen FRACKs, and
ultimately causes the unit tests to succeed again.
Review: https://reviewboard.asterisk.org/r/4014
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_cel.c')
| -rw-r--r-- | tests/test_cel.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/test_cel.c b/tests/test_cel.c index 017c48b47..937a0cf27 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -206,9 +206,23 @@ static void do_sleep(void) /*! \brief David's Caller ID */ #define DAVID_CALLERID { .id.name.str = "David", .id.name.valid = 1, .id.number.str = "400", .id.number.valid = 1, } +/*! \brief Set ulaw format on channel */ +#define SET_FORMATS(chan) do {\ + struct ast_format_cap *caps;\ + caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);\ + ast_format_cap_append(caps, ast_format_ulaw, 0);\ + ast_channel_nativeformats_set((chan), caps);\ + ast_channel_set_writeformat((chan), ast_format_ulaw);\ + ast_channel_set_rawwriteformat((chan), ast_format_ulaw);\ + ast_channel_set_readformat((chan), ast_format_ulaw);\ + ast_channel_set_rawreadformat((chan), ast_format_ulaw);\ + ao2_ref(caps, -1);\ +} while (0) + /*! \brief Create a \ref test_cel_chan_tech for Alice. */ #define CREATE_ALICE_CHANNEL(channel_var, caller_id) do { \ (channel_var) = ast_channel_alloc(0, AST_STATE_DOWN, (caller_id)->id.number.str, (caller_id)->id.name.str, "100", "100", "default", NULL, NULL, 0, CHANNEL_TECH_NAME "/Alice"); \ + SET_FORMATS((channel_var));\ APPEND_EVENT(channel_var, AST_CEL_CHANNEL_START, NULL, NULL); \ ast_channel_unlock((channel_var)); \ } while (0) @@ -216,6 +230,7 @@ static void do_sleep(void) /*! \brief Create a \ref test_cel_chan_tech for Bob. */ #define CREATE_BOB_CHANNEL(channel_var, caller_id) do { \ (channel_var) = ast_channel_alloc(0, AST_STATE_DOWN, (caller_id)->id.number.str, (caller_id)->id.name.str, "200", "200", "default", NULL, NULL, 0, CHANNEL_TECH_NAME "/Bob"); \ + SET_FORMATS((channel_var));\ APPEND_EVENT(channel_var, AST_CEL_CHANNEL_START, NULL, NULL); \ ast_channel_unlock((channel_var)); \ } while (0) @@ -223,6 +238,7 @@ static void do_sleep(void) /*! \brief Create a \ref test_cel_chan_tech for Charlie. */ #define CREATE_CHARLIE_CHANNEL(channel_var, caller_id) do { \ (channel_var) = ast_channel_alloc(0, AST_STATE_DOWN, (caller_id)->id.number.str, (caller_id)->id.name.str, "300", "300", "default", NULL, NULL, 0, CHANNEL_TECH_NAME "/Charlie"); \ + SET_FORMATS((channel_var));\ APPEND_EVENT(channel_var, AST_CEL_CHANNEL_START, NULL, NULL); \ ast_channel_unlock((channel_var)); \ } while (0) @@ -230,6 +246,7 @@ static void do_sleep(void) /*! \brief Create a \ref test_cel_chan_tech for David. */ #define CREATE_DAVID_CHANNEL(channel_var, caller_id) do { \ (channel_var) = ast_channel_alloc(0, AST_STATE_DOWN, (caller_id)->id.number.str, (caller_id)->id.name.str, "400", "400", "default", NULL, NULL, 0, CHANNEL_TECH_NAME "/David"); \ + SET_FORMATS((channel_var));\ APPEND_EVENT(channel_var, AST_CEL_CHANNEL_START, NULL, NULL); \ ast_channel_unlock((channel_var)); \ } while (0) @@ -738,6 +755,7 @@ AST_TEST_DEFINE(test_cel_single_multiparty_bridge) #define START_DIALED_FULL(caller, callee, number, name) do { \ callee = ast_channel_alloc(0, AST_STATE_DOWN, NULL, NULL, number, NULL, NULL, NULL, caller, 0, CHANNEL_TECH_NAME "/" name); \ + SET_FORMATS(callee);\ ast_channel_unlock(callee); \ if (append_expected_event(callee, AST_CEL_CHANNEL_START, NULL, NULL, NULL)) { \ return AST_TEST_FAIL; \ |