diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-12-03 20:58:41 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-12-03 20:58:41 +0000 |
| commit | a83b4ad1dabaa8a0e8f5fba996e18f5b07d8e2a5 (patch) | |
| tree | 92c60b88c88f0a17a82b1c7dbb38ed8292a97bb2 /tests/test_cel.c | |
| parent | e7c97d158ff5ef4a6ea7dd18256b9fd866d70004 (diff) | |
tests/test_cel: Add test_cel_attended_transfer_bridges_link to racey tests
Despite failing less often, the ordering of the ATTENDEDTRANSFER event and the
BRIDGE_EXIT event for the Alice and David channels is not defined. This makes
the test still fail.
........
Merged revisions 428918 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@428919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_cel.c')
| -rw-r--r-- | tests/test_cel.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/test_cel.c b/tests/test_cel.c index cd39a6254..7f77a1bee 100644 --- a/tests/test_cel.c +++ b/tests/test_cel.c @@ -310,7 +310,9 @@ static int append_expected_event_snapshot( struct ast_json *extra, const char *peer); +#ifdef RACEY_TESTS static int append_dummy_event(void); +#endif static struct ast_str *__test_cel_generate_peer_str(struct ast_channel_snapshot *chan, struct ast_bridge_snapshot *bridge) { @@ -1469,6 +1471,10 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_merge) return AST_TEST_PASS; } +/* XXX Validation needs to take into account the BRIDGE_EXIT for David and the + * ATTENDEDTRANSFER message are not guaranteed to be ordered + */ +#ifdef RACEY_TESTS AST_TEST_DEFINE(test_cel_attended_transfer_bridges_link) { RAII_VAR(struct ast_channel *, chan_alice, NULL, safe_channel_release); @@ -1553,6 +1559,7 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_link) return AST_TEST_PASS; } +#endif AST_TEST_DEFINE(test_cel_dial_pickup) { @@ -1734,6 +1741,7 @@ static int append_event(struct ast_event *ev) return 0; } +#ifdef RACEY_TESTS static int append_dummy_event(void) { RAII_VAR(struct ast_event *, ev, NULL, ast_free); @@ -1746,6 +1754,7 @@ static int append_dummy_event(void) return append_event(ev); } +#endif static int append_expected_event_snapshot( struct ast_channel_snapshot *snapshot, @@ -2121,11 +2130,11 @@ static int unload_module(void) #ifdef RACEY_TESTS AST_TEST_UNREGISTER(test_cel_dial_answer_multiparty); AST_TEST_UNREGISTER(test_cel_attended_transfer_bridges_swap); + AST_TEST_UNREGISTER(test_cel_attended_transfer_bridges_link); #endif AST_TEST_UNREGISTER(test_cel_blind_transfer); AST_TEST_UNREGISTER(test_cel_attended_transfer_bridges_merge); - AST_TEST_UNREGISTER(test_cel_attended_transfer_bridges_link); AST_TEST_UNREGISTER(test_cel_dial_pickup); @@ -2196,11 +2205,11 @@ static int load_module(void) #ifdef RACEY_TESTS AST_TEST_REGISTER(test_cel_dial_answer_multiparty); AST_TEST_REGISTER(test_cel_attended_transfer_bridges_swap); + AST_TEST_REGISTER(test_cel_attended_transfer_bridges_link); #endif AST_TEST_REGISTER(test_cel_blind_transfer); AST_TEST_REGISTER(test_cel_attended_transfer_bridges_merge); - AST_TEST_REGISTER(test_cel_attended_transfer_bridges_link); AST_TEST_REGISTER(test_cel_dial_pickup); |