diff options
| author | Automerge script <automerge@asterisk.org> | 2012-11-18 15:20:26 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-11-18 15:20:26 +0000 |
| commit | dd85c232f04f2d8a53d84f9480a65fcadcb64ba5 (patch) | |
| tree | b104297248842bf84ee18344fc5a210502ea8092 | |
| parent | 623d741ba1083dc5c28fc96a93f2920ca2d3ff1c (diff) | |
Merged revisions 376416 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r376416 | mjordan | 2012-11-18 08:31:32 -0600 (Sun, 18 Nov 2012) | 13 lines
Add a test event that reports changes in ConfBridge state
This patch adds a test event to ConfBridge that reports transitions between
states in ConfBridge. This is used by tests in the Asterisk Test Suite
that verify state changes based on the entering/leaving of conference
participants.
........
Merged revisions 376414 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 376415 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/confbridge/conf_state.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/confbridge/conf_state.c b/apps/confbridge/conf_state.c index 1d8750918..e3684058a 100644 --- a/apps/confbridge/conf_state.c +++ b/apps/confbridge/conf_state.c @@ -38,6 +38,7 @@ #include "asterisk.h" #include "asterisk/logger.h" +#include "asterisk/test.h" #include "include/conf_state.h" #include "include/confbridge.h" @@ -60,6 +61,10 @@ void conf_default_leave_waitmarked(struct conference_bridge_user *cbu) void conf_change_state(struct conference_bridge_user *cbu, struct conference_state *newstate) { ast_debug(1, "Changing conference '%s' state from %s to %s\n", cbu->conference_bridge->name, cbu->conference_bridge->state->name, newstate->name); + ast_test_suite_event_notify("CONF_CHANGE_STATE", "Conference: %s\r\nOldState: %s\r\nNewState: %s\r\n", + cbu->conference_bridge->name, + cbu->conference_bridge->state->name, + newstate->name); if (cbu->conference_bridge->state->exit) { cbu->conference_bridge->state->exit(cbu); } |