From: Matthew Jordan <mjordan@digium.com>
Date: Wed, 3 Dec 2014 20:58:26 +0000 (+0000)
Subject: tests/test_cel: Add test_cel_attended_transfer_bridges_link to racey tests
X-Git-Tag: 12.8.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d46555f1d6a26ec014591ba3d2f482b7c0f3494f;p=thirdparty%2Fasterisk.git

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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@428918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/tests/test_cel.c b/tests/test_cel.c
index 40cc0760b8..ae9fa02348 100644
--- a/tests/test_cel.c
+++ b/tests/test_cel.c
@@ -292,7 +292,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)
 {
@@ -1442,6 +1444,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);
@@ -1526,6 +1532,7 @@ AST_TEST_DEFINE(test_cel_attended_transfer_bridges_link)
 
 	return AST_TEST_PASS;
 }
+#endif
 
 AST_TEST_DEFINE(test_cel_dial_pickup)
 {
@@ -1707,6 +1714,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);
@@ -1719,6 +1727,7 @@ static int append_dummy_event(void)
 
 	return append_event(ev);
 }
+#endif
 
 static int append_expected_event_snapshot(
 	struct ast_channel_snapshot *snapshot,
@@ -2094,11 +2103,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);
 
@@ -2169,11 +2178,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);