[asterisk-commits] mjordan: trunk r428920 - in /trunk: ./ tests/test_cel.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Dec  3 14:59:01 2014
New Revision: 428920

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428920
Log:
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
........

Merged revisions 428919 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/tests/test_cel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_cel.c?view=diff&rev=428920&r1=428919&r2=428920
==============================================================================
--- trunk/tests/test_cel.c (original)
+++ trunk/tests/test_cel.c Wed Dec  3 14:59:01 2014
@@ -310,7 +310,9 @@
 	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 @@
 	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 @@
 
 	return AST_TEST_PASS;
 }
+#endif
 
 AST_TEST_DEFINE(test_cel_dial_pickup)
 {
@@ -1734,6 +1741,7 @@
 	return 0;
 }
 
+#ifdef RACEY_TESTS
 static int append_dummy_event(void)
 {
 	RAII_VAR(struct ast_event *, ev, NULL, ast_free);
@@ -1746,6 +1754,7 @@
 
 	return append_event(ev);
 }
+#endif
 
 static int append_expected_event_snapshot(
 	struct ast_channel_snapshot *snapshot,
@@ -2121,11 +2130,11 @@
 #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 @@
 #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);