diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-08-13 20:36:51 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-08-13 20:36:51 +0000 |
| commit | 45c6620d744ca2a0ce89805fea2178fb1280aaa5 (patch) | |
| tree | 15b6c222c5aa1da58500d2d15929d73ad23e3f57 | |
| parent | 5d02d8e01613b34f5a253916e4f0168010622f26 (diff) | |
Add test instrumentation
This adds test instrumentation for loading and unloading of modules
and for certain actions in MeetMe to be used in the testsuite or any
other consumer of AMI events. These will only be generated when
Asterisk is built with TEST_FRAMEWORK enabled.
(issue PQ-1131)
(issue PQ-1133)
........
Merged revisions 371201 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 371203 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 371227 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_meetme.c | 11 | ||||
| -rw-r--r-- | main/loader.c | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 59bde4012..593ce5b43 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2892,6 +2892,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0); } } else { + int lastusers = conf->users; if (user->dahdichannel && ast_test_flag64(confflags, CONFFLAG_STARMENU)) { /* Set CONFMUTE mode on DAHDI channel to mute DTMF tones when the menu is enabled */ x = 1; @@ -3171,7 +3172,15 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } break; } - + + /* Throw a TestEvent if a user exit did not cause this user to leave the conference */ + if (conf->users != lastusers) { + if (conf->users < lastusers) { + ast_test_suite_event_notify("NOEXIT", "Message: CONFFLAG_MARKEDEXIT\r\nLastUsers: %d\r\nUsers: %d", lastusers, conf->users); + } + lastusers = conf->users; + } + /* Check if my modes have changed */ /* If I should be muted but am still talker, mute me */ diff --git a/main/loader.c b/main/loader.c index 5dab43b32..d82408349 100644 --- a/main/loader.c +++ b/main/loader.c @@ -55,6 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/udptl.h" #include "asterisk/heap.h" #include "asterisk/app.h" +#include "asterisk/test.h" #include <dlfcn.h> @@ -572,8 +573,10 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f mod->info->restore_globals(); #ifdef LOADABLE_MODULES - if (!error) + if (!error) { unload_dynamic_module(mod); + ast_test_suite_event_notify("MODULE_UNLOAD", "Message: %s", resource_name); + } #endif if (!error) @@ -907,6 +910,7 @@ int ast_load_resource(const char *resource_name) int res; AST_LIST_LOCK(&module_list); res = load_resource(resource_name, 0, NULL, 0); + ast_test_suite_event_notify("MODULE_LOAD", "Message: %s", resource_name); AST_LIST_UNLOCK(&module_list); return res; |