[asterisk-commits] mmichelson: trunk r400364 - in /trunk: ./ tests/test_cel.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Oct  3 09:59:29 2013
New Revision: 400364

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400364
Log:
Get rid of uses of stasis_topic_wait()
........

Merged revisions 400362 from http://svn.asterisk.org/svn/asterisk/branches/12

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Oct  3 09:59:29 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217,400227,400236,400245,400254,400256,400265,400268,400270,400281,400284,400286,400291,400303,400312,400316,400318-400319,400356
+/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217,400227,400236,400245,400254,400256,400265,400268,400270,400281,400284,400286,400291,400303,400312,400316,400318-400319,400356,400362

Modified: trunk/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_cel.c?view=diff&rev=400364&r1=400363&r2=400364
==============================================================================
--- trunk/tests/test_cel.c (original)
+++ trunk/tests/test_cel.c Thu Oct  3 09:59:29 2013
@@ -122,8 +122,6 @@
 
 #define BRIDGE_EXIT_EVENT(channel, bridge) do { \
 	RAII_VAR(struct ast_str *, peer_str, NULL, ast_free); \
-	stasis_topic_wait(ast_channel_topic_all()); \
-	stasis_topic_wait(ast_bridge_topic_all()); \
 	peer_str = test_cel_generate_peer_str(channel, bridge); \
 	ast_test_validate(test, peer_str != NULL); \
 	BRIDGE_EXIT_EVENT_PEER(channel, bridge, ast_str_buffer(peer_str)); \
@@ -139,8 +137,6 @@
 #define BRIDGE_EXIT_SNAPSHOT(channel, bridge) do { \
 	RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
 	RAII_VAR(struct ast_str *, peer_str, NULL, ast_free); \
-	stasis_topic_wait(ast_channel_topic_all()); \
-	stasis_topic_wait(ast_bridge_topic_all()); \
 	peer_str = test_cel_generate_peer_str_snapshot(channel, bridge); \
 	ast_test_validate(test, peer_str != NULL); \
 	extra = ast_json_pack("{s: s}", "bridge_id", bridge->uniqueid); \
@@ -157,8 +153,6 @@
 
 #define BRIDGE_ENTER_EVENT(channel, bridge) do { \
 	RAII_VAR(struct ast_str *, peer_str, NULL, ast_free); \
-	stasis_topic_wait(ast_channel_topic_all()); \
-	stasis_topic_wait(ast_bridge_topic_all()); \
 	peer_str = test_cel_generate_peer_str(channel, bridge); \
 	ast_test_validate(test, peer_str != NULL); \
 	BRIDGE_ENTER_EVENT_PEER(channel, bridge, ast_str_buffer(peer_str)); \